1.1 --- a/configure.ac Wed Nov 05 08:11:44 2008 +0000
1.2 +++ b/configure.ac Wed Nov 05 14:44:37 2008 +0000
1.3 @@ -19,8 +19,6 @@
1.4 AC_CONFIG_SRCDIR([lemon/list_graph.h])
1.5 AC_CONFIG_HEADERS([config.h lemon/config.h])
1.6
1.7 -lx_cmdline_cxxflags_set=${CXXFLAGS+set}
1.8 -
1.9 dnl Do compilation tests using the C++ compiler.
1.10 AC_LANG([C++])
1.11
1.12 @@ -46,9 +44,10 @@
1.13 fi
1.14
1.15 dnl Set custom compiler flags when using g++.
1.16 -if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes -a "$ICC" = no; then
1.17 - CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
1.18 +if test "$GXX" = yes -a "$ICC" = no; then
1.19 + WARNINGCXXFLAGS="-Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
1.20 fi
1.21 +AC_SUBST([WARNINGCXXFLAGS])
1.22
1.23 dnl Checks for libraries.
1.24 #LX_CHECK_GLPK
1.25 @@ -113,7 +112,7 @@
1.26 echo Package version............... : $PACKAGE-$VERSION
1.27 echo
1.28 echo C++ compiler.................. : $CXX
1.29 -echo C++ compiles flags............ : $CXXFLAGS
1.30 +echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS
1.31 echo
1.32 #echo GLPK support.................. : $lx_glpk_found
1.33 #echo CPLEX support................. : $lx_cplex_found