Mercurial > hg > svgui

comparison configure.ac @ 946:36cddc3de023 alignment_view

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 788b7623bfca
children 7dcd03517685
comparison
equal deleted inserted replaced
897:499b637f2a26 946:36cddc3de023
23 AC_PROG_CC 23 AC_PROG_CC
24 AC_PROG_CXX 24 AC_PROG_CXX
25 AC_PROG_INSTALL 25 AC_PROG_INSTALL
26 AC_PROG_MKDIR_P 26 AC_PROG_MKDIR_P
27 27
28 # We are daringly making use of C++11 now
29 AX_CXX_COMPILE_STDCXX_11(noext)
30
28 AC_HEADER_STDC 31 AC_HEADER_STDC
29 32
30 # These are the flags Autoconf guesses for us; we use them later if 33 # These are the flags Autoconf guesses for us; we use them later if
31 # the user has set none and we are not using GCC (so lack our own 34 # the user has set none and we are not using GCC (so lack our own
32 # preferred flags) 35 # preferred flags)
48 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS" 51 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
49 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS" 52 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
50 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS" 53 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
51 54
52 if test "x$GCC" = "xyes"; then 55 if test "x$GCC" = "xyes"; then
53 CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe" 56 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
54 CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe" 57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
55 CXXFLAGS_MINIMAL="-g0 -O0" 58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
59 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
56 fi 60 fi
57 61
58 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" 62 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
59 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" 63 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
60 64