comparison configure.ac @ 1465:9401d021b47b 3.0-integration

Some copyright dates and build adjustments
author Chris Cannam
date Tue, 03 Jan 2017 16:14:31 +0000
parents 2067e2c92cc8
children add46e759c27
comparison
equal deleted inserted replaced
1464:cb41b2184622 1465:9401d021b47b
38 PKG_PROG_PKG_CONFIG 38 PKG_PROG_PKG_CONFIG
39 39
40 SV_CHECK_QT 40 SV_CHECK_QT
41 41
42 SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING" 42 SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
43 SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DWANT_TIMING" # -DNO_TIMING" 43 SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING"
44 SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE" 44 SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
45 45
46 # Now we have: USER_CXXFLAGS contains any flags the user set 46 # Now we have: USER_CXXFLAGS contains any flags the user set
47 # explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought 47 # explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
48 # we should use. If we have GCC, we override the latter but then 48 # we should use. If we have GCC, we override the latter but then
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 -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 -Werror" 57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2" 58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
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"
63 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" 63 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"