comparison configure.ac @ 1082:b2c45b831ea8 3.0-integration

Merge from default branch
author Chris Cannam
date Wed, 18 Nov 2015 12:08:33 +0000
parents 28ccb621d1af 94253fa11318
children f39869a1cbc0
comparison
equal deleted inserted replaced
1071:b0f6dce4eab0 1082:b2c45b831ea8
51 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS" 51 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
52 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS" 52 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
53 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS" 53 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
54 54
55 if test "x$GCC" = "xyes"; then 55 if test "x$GCC" = "xyes"; then
56 CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe" 56 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g" 57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2" 58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
59 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0" 59 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
60 fi 60 fi
61 61
62 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" 62 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"