Changeset 508:861a9d5ff283 in lemon-1.2 for configure.ac
- Timestamp:
- 01/23/09 17:42:07 (16 years ago)
- Branch:
- default
- Children:
- 509:c5919679af17, 512:9b9ffe7d9b75
- Parents:
- 507:e6ae4999cf22 (diff), 478:64c2641286df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r478 r508 19 19 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 20 20 AC_CONFIG_HEADERS([config.h lemon/config.h]) 21 22 lx_cmdline_cxxflags_set=${CXXFLAGS+set}23 21 24 22 dnl Do compilation tests using the C++ compiler. … … 47 45 48 46 dnl Set custom compiler flags when using g++. 49 if test x"$lx_cmdline_cxxflags_set" != x"set" -a"$GXX" = yes -a "$ICC" = no; then50 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"47 if test "$GXX" = yes -a "$ICC" = no; then 48 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" 51 49 fi 50 AC_SUBST([WARNINGCXXFLAGS]) 52 51 53 52 dnl Checks for libraries. 54 #LX_CHECK_GLPK 55 #LX_CHECK_CPLEX 56 #LX_CHECK_SOPLEX 53 LX_CHECK_GLPK 54 LX_CHECK_CPLEX 55 LX_CHECK_SOPLEX 56 LX_CHECK_CLP 57 58 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"]) 59 AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"]) 57 60 58 61 dnl Disable/enable building the demo programs. … … 115 118 echo 116 119 echo C++ compiler.................. : $CXX 117 echo C++ compiles flags............ : $ CXXFLAGS120 echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS 118 121 echo 119 #echo GLPK support.................. : $lx_glpk_found 120 #echo CPLEX support................. : $lx_cplex_found 121 #echo SOPLEX support................ : $lx_soplex_found 122 #echo 122 echo GLPK support.................. : $lx_glpk_found 123 echo CPLEX support................. : $lx_cplex_found 124 echo SOPLEX support................ : $lx_soplex_found 125 echo CLP support................... : $lx_clp_found 126 echo 123 127 echo Build demo programs........... : $enable_demo 124 128 echo Build additional tools........ : $enable_tools -
configure.ac
r459 r508 101 101 dnl Add dependencies on files generated by configure. 102 102 AC_SUBST([CONFIG_STATUS_DEPENDENCIES], 103 ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in '])103 ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in']) 104 104 105 105 AC_CONFIG_FILES([ 106 106 Makefile 107 cmake/version.cmake 107 108 doc/Doxyfile 108 109 lemon/lemon.pc
Note: See TracChangeset
for help on using the changeset viewer.