comparison configure @ 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 ccc667cdb8ad
comparison
equal deleted inserted replaced
1071:b0f6dce4eab0 1082:b2c45b831ea8
4353 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS" 4353 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
4354 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS" 4354 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
4355 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS" 4355 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
4356 4356
4357 if test "x$GCC" = "xyes"; then 4357 if test "x$GCC" = "xyes"; then
4358 CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe" 4358 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4359 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g" 4359 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
4360 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2" 4360 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
4361 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0" 4361 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
4362 fi 4362 fi
4363 4363
4364 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" 4364 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"