# HG changeset patch # User ladanyi # Date 1118779301 0 # Node ID f7e9cc3bc2da00d9b4428fc1e3235535331b98d3 # Parent 92755f9a4e2a0244d12e190408daf5fdf97d3859 - separate file for each m4 script - consistent naming - removed cxxflags.m4 diff -r 92755f9a4e2a -r f7e9cc3bc2da Makefile.am --- a/Makefile.am Tue Jun 14 19:19:59 2005 +0000 +++ b/Makefile.am Tue Jun 14 20:01:41 2005 +0000 @@ -4,12 +4,13 @@ LICENSE \ lemon.spec \ autopackage/default.apspec.in \ + config/lx_check_cplex.m4 \ + config/lx_check_glpk.m4 \ config/lx_docdir_suffix.m4 \ - config/cxxflags.m4 \ - config/lp.m4 \ - config/misc.m4 + config/lx_enable_doc.m4 \ + config/lx_enable_gui.m4 -if WANT_DOCS +if WANT_DOC MAYBE_DOC = doc endif if WANT_GUI diff -r 92755f9a4e2a -r f7e9cc3bc2da config/cxxflags.m4 --- a/config/cxxflags.m4 Tue Jun 14 19:19:59 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -dnl LX_C_IFDEF(MACRO-NAME, ACTION-IF-DEF, ACTION-IF-NOT-DEF) -dnl -dnl Check for the definition of macro MACRO-NAME using the current -dnl language's compiler. -dnl -dnl Orignally written by Ludovic Courtès -AC_DEFUN([LX_C_IFDEF], - [AC_COMPILE_IFELSE([#ifndef $1 - # error "Macro $1 is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif], - [$2], [$3])]) - - -dnl LX_CXX_COMPILER_VENDOR(VENDOR-NAME, [NICKNAME]) -dnl -dnl Set VENDOR-NAME to the lower-case name of the compiler vendor or -dnl `unknown' if the compiler's vendor is unknown. `compaq' means the -dnl CXX compiler as available on Tru64/OSF1/Digital Unix on Alpha -dnl machines. If NICKNAME is provided, set it to the compiler's usual -dnl name (eg. `g++', `cxx', `aCC', etc.). -dnl -dnl Based on work of Ludovic Courtès -AC_DEFUN([LX_CXX_COMPILER_VENDOR], - [AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PROG_CXXCPP]) - AC_CACHE_CHECK([the C++ compiler vendor], - [lx_cv_cxx_compiler_vendor], - - [AC_LANG_PUSH([C++]) - - dnl Intel's icpc - LX_C_IFDEF([__INTEL_COMPILER], - [lx_cv_cxx_compiler_vendor=intel], - [dnl GNU C++ - LX_C_IFDEF([__GNUG__], - [lx_cv_cxx_compiler_vendor=gnu], - [LX_C_IFDEF([__DECCXX], - [lx_cv_cxx_compiler_vendor=compaq], - [dnl HP's aCC - LX_C_IFDEF([__HP_aCC], - [lx_cv_cxx_compiler_vendor=hp], - [dnl SGI CC - LX_C_IFDEF([__sgi], - [lx_cv_cxx_compiler_vendor=sgi], - [dnl Note: We are using the C compiler because VC++ doesn't - dnl recognize `.cc'(which is used by `configure') as a C++ file - dnl extension and requires `/TP' to be passed. - AC_LANG_PUSH([C]) - LX_C_IFDEF([_MSC_VER], - [lx_cv_cxx_compiler_vendor=microsoft], - [lx_cv_cxx_compiler_vendor=unknown]) - AC_LANG_POP()])])])])]) - - AC_LANG_POP()]) - $1="$lx_cv_cxx_compiler_vendor" - - dnl The compiler nickname - ifelse([$2], , [], - [case "$lx_cv_cxx_compiler_vendor" in - intel) $2=icpc;; - gnu) $2=g++;; - compaq) $2=cxx;; - hp) $2=aCC;; - sgi) $2=CC;; - microsoft) $2=cl;; - *) $2=unknown;; - esac])]) - - -dnl Set some debugging and error reporting related compiler flags. -dnl uses lx_user_cxxflags -AC_DEFUN([LX_SET_CXXFLAGS], - [AC_ARG_ENABLE([debug], -AS_HELP_STRING([--enable-debug@<:@=yes|no|full@:>@], [build with debugging support]) -AS_HELP_STRING([--disable-debug], [build without debugging support @<:@default@:>@]), - [], [enable_debug=no]) - LX_CXX_COMPILER_VENDOR([lx_cxx_compiler_vendor]) - AC_MSG_CHECKING([whether to build with debugging support]) - if test x"$enable_debug" != x"no"; then - AC_DEFINE([DEBUG], [1], [Define for debugging support]) - - lx_gnu_cxxflags="-ansi -pedantic -Wall -Wextra" - lx_intel_cxxflags="-g" - lx_unknown_cxxflags="-g" - - if test x"$enable_debug" = x"yes"; then - lx_gnu_cxxflags="-g $lx_gnu_cxxflags" - AC_MSG_RESULT([yes]) - else - lx_gnu_cxxflags="-g3 --no-inline $lx_gnu_cxxflags" - AC_MSG_RESULT([full]) - fi - - if test x"$lx_cxx_compiler_vendor" = x"gnu"; then - CXXFLAGS="$lx_user_cxxflags $lx_gnu_cxxflags" - elif test x"$lx_cxx_compiler_vendor" = x"intel"; then - CXXFLAGS="$lx_user_cxxflags $lx_intel_cxxflags" - else - CXXFLAGS="$lx_user_cxxflags $lx_unknown_cxxflags" - fi - else - AC_MSG_RESULT([no]) - fi - - AC_ARG_ENABLE([extra-warnings], -AS_HELP_STRING([--enable-extra-warnings], [enable extra warning messages]) -AS_HELP_STRING([--disable-extra-warnings], [disable extra warning messages @<:@default@:>@]), - [],[enable_extra_warnings=no]) - AC_MSG_CHECKING(whether to enable extra warning flags) - if test x"$enable_extra_warnings" != x"no"; then - if test x"$lx_cxx_compiler_vendor" = x"gnu"; then - CXXFLAGS="$CXXFLAGS -ansi -pedantic -Wall -Wextra" - CXXFLAGS="$CXXFLAGS -Wfloat-equal -Wundef -Wendif-labels -Wshadow" - CXXFLAGS="$CXXFLAGS -Wpointer-arith -Wcast-qual -Wcast-align" - CXXFLAGS="$CXXFLAGS -Wwrite-strings -Wconversion -Waggregate-return" - CXXFLAGS="$CXXFLAGS -Wmissing-noreturn -Wmissing-format-attribute" - CXXFLAGS="$CXXFLAGS -Wpacked -Wpadded -Wredundant-decls" - CXXFLAGS="$CXXFLAGS -Wunreachable-code -Winline -Winvalid-pch" - CXXFLAGS="$CXXFLAGS -Wlong-long -Wdisabled-optimization" - CXXFLAGS="$CXXFLAGS -Wstack-protector" - elif test x"$lx_cxx_compiler_vendor" = x"intel"; then - CXXFLAGS="$CXXFLAGS -w2" - fi - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/lp.m4 --- a/config/lp.m4 Tue Jun 14 19:19:59 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -AC_DEFUN([LX_CHECK_GLPK], -[ - AC_ARG_WITH([glpk], -AS_HELP_STRING([--with-glpk@<:@=PREFIX@:>@], [search for GLPK under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-glpk], [disable checking for GLPK]), - [], [with_glpk=yes]) - - AC_ARG_WITH([glpk-includedir], -AS_HELP_STRING([--with-glpk-includedir=DIR], [search for GLPK headers in DIR]), - [], [with_glpk_includedir=no]) - - AC_ARG_WITH([glpk-libdir], -AS_HELP_STRING([--with-glpk-libdir=DIR], [search for GLPK libraries in DIR]), - [], [with_glpk_libdir=no]) - - lx_glpk_found=no - if test x"$with_glpk" != x"no"; then - AC_MSG_CHECKING([for GLPK]) - - if test x"$with_glpk_includedir" != x"no"; then - GLPK_CFLAGS="-I$with_glpk_includedir" - elif test x"$with_glpk" != x"yes"; then - GLPK_CFLAGS="-I$with_glpk/include" - fi - - if test x"$with_glpk_libdir" != x"no"; then - GLPK_LDFLAGS="-L$with_glpk_libdir" - elif test x"$with_glpk" != x"yes"; then - GLPK_LDFLAGS="-L$with_glpk/lib" - fi - GLPK_LIBS="-lglpk" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$GLPK_CFLAGS" - LDFLAGS="$GLPK_LDFLAGS" - LIBS="$GLPK_LIBS" - - lx_glpk_test_prog=' - extern "C" { - #include - } - - int main(int argc, char* argv[]) - { - LPX *lp; - lp = lpx_create_prob(); - lpx_delete_prob(lp); - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_glpk_found" = x"yes"; then - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) - AC_MSG_RESULT([yes]) - else - GLPK_CFLAGS="" - GLPK_LDFLAGS="" - GLPK_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS" - AC_SUBST(GLPK_CFLAGS) - AC_SUBST(GLPK_LIBS) - AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"]) -]) - - -AC_DEFUN([LX_CHECK_CPLEX], -[ - AC_ARG_WITH([cplex], -AS_HELP_STRING([--with-cplex@<:@=PREFIX@:>@], [search for CPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-cplex], [disable checking for CPLEX]), - [], [with_cplex=yes]) - - AC_ARG_WITH([cplex-includedir], -AS_HELP_STRING([--with-cplex-includedir=DIR], [search for CPLEX headers in DIR]), - [], [with_cplex_includedir=no]) - - AC_ARG_WITH([cplex-libdir], -AS_HELP_STRING([--with-cplex-libdir=DIR], [search for CPLEX libraries in DIR]), - [], [with_cplex_libdir=no]) - - lx_cplex_found=no - if test x"$with_cplex" != x"no"; then - AC_MSG_CHECKING([for CPLEX]) - - if test x"$with_cplex_includedir" != x"no"; then - CPLEX_CFLAGS="-I$with_cplex_includedir" - elif test x"$with_cplex" != x"yes"; then - CPLEX_CFLAGS="-I$with_cplex/include" - fi - - if test x"$with_cplex_libdir" != x"no"; then - CPLEX_LDFLAGS="-L$with_cplex_libdir" - elif test x"$with_cplex" != x"yes"; then - CPLEX_LDFLAGS="-L$with_cplex/lib" - fi - CPLEX_LIBS="-lcplex -lm -lpthread" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$CPLEX_CFLAGS" - LDFLAGS="$CPLEX_LDFLAGS" - LIBS="$CPLEX_LIBS" - - lx_cplex_test_prog=' - extern "C" { - #include - } - - int main(int argc, char* argv[]) - { - CPXENVptr env = NULL; - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_cplex_found" = x"yes"; then - AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) - AC_MSG_RESULT([yes]) - else - CPLEX_CFLAGS="" - CPLEX_LDFLAGS="" - CPLEX_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS" - AC_SUBST(CPLEX_CFLAGS) - AC_SUBST(CPLEX_LIBS) - AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"]) -]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/lx_check_cplex.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/lx_check_cplex.m4 Tue Jun 14 20:01:41 2005 +0000 @@ -0,0 +1,73 @@ +AC_DEFUN([LX_CHECK_CPLEX], +[ + AC_ARG_WITH([cplex], +AS_HELP_STRING([--with-cplex@<:@=PREFIX@:>@], [search for CPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) +AS_HELP_STRING([--without-cplex], [disable checking for CPLEX]), + [], [with_cplex=yes]) + + AC_ARG_WITH([cplex-includedir], +AS_HELP_STRING([--with-cplex-includedir=DIR], [search for CPLEX headers in DIR]), + [], [with_cplex_includedir=no]) + + AC_ARG_WITH([cplex-libdir], +AS_HELP_STRING([--with-cplex-libdir=DIR], [search for CPLEX libraries in DIR]), + [], [with_cplex_libdir=no]) + + lx_cplex_found=no + if test x"$with_cplex" != x"no"; then + AC_MSG_CHECKING([for CPLEX]) + + if test x"$with_cplex_includedir" != x"no"; then + CPLEX_CFLAGS="-I$with_cplex_includedir" + elif test x"$with_cplex" != x"yes"; then + CPLEX_CFLAGS="-I$with_cplex/include" + fi + + if test x"$with_cplex_libdir" != x"no"; then + CPLEX_LDFLAGS="-L$with_cplex_libdir" + elif test x"$with_cplex" != x"yes"; then + CPLEX_LDFLAGS="-L$with_cplex/lib" + fi + CPLEX_LIBS="-lcplex -lm -lpthread" + + lx_save_cxxflags="$CXXFLAGS" + lx_save_ldflags="$LDFLAGS" + lx_save_libs="$LIBS" + CXXFLAGS="$CPLEX_CFLAGS" + LDFLAGS="$CPLEX_LDFLAGS" + LIBS="$CPLEX_LIBS" + + lx_cplex_test_prog=' + extern "C" { + #include + } + + int main(int argc, char* argv[]) + { + CPXENVptr env = NULL; + return 0; + }' + + AC_LANG_PUSH(C++) + AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no]) + AC_LANG_POP(C++) + + CXXFLAGS="$lx_save_cxxflags" + LDFLAGS="$lx_save_ldflags" + LIBS="$lx_save_libs" + + if test x"$lx_cplex_found" = x"yes"; then + AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) + AC_MSG_RESULT([yes]) + else + CPLEX_CFLAGS="" + CPLEX_LDFLAGS="" + CPLEX_LIBS="" + AC_MSG_RESULT([no]) + fi + fi + CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS" + AC_SUBST(CPLEX_CFLAGS) + AC_SUBST(CPLEX_LIBS) + AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"]) +]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/lx_check_glpk.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/lx_check_glpk.m4 Tue Jun 14 20:01:41 2005 +0000 @@ -0,0 +1,75 @@ +AC_DEFUN([LX_CHECK_GLPK], +[ + AC_ARG_WITH([glpk], +AS_HELP_STRING([--with-glpk@<:@=PREFIX@:>@], [search for GLPK under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) +AS_HELP_STRING([--without-glpk], [disable checking for GLPK]), + [], [with_glpk=yes]) + + AC_ARG_WITH([glpk-includedir], +AS_HELP_STRING([--with-glpk-includedir=DIR], [search for GLPK headers in DIR]), + [], [with_glpk_includedir=no]) + + AC_ARG_WITH([glpk-libdir], +AS_HELP_STRING([--with-glpk-libdir=DIR], [search for GLPK libraries in DIR]), + [], [with_glpk_libdir=no]) + + lx_glpk_found=no + if test x"$with_glpk" != x"no"; then + AC_MSG_CHECKING([for GLPK]) + + if test x"$with_glpk_includedir" != x"no"; then + GLPK_CFLAGS="-I$with_glpk_includedir" + elif test x"$with_glpk" != x"yes"; then + GLPK_CFLAGS="-I$with_glpk/include" + fi + + if test x"$with_glpk_libdir" != x"no"; then + GLPK_LDFLAGS="-L$with_glpk_libdir" + elif test x"$with_glpk" != x"yes"; then + GLPK_LDFLAGS="-L$with_glpk/lib" + fi + GLPK_LIBS="-lglpk" + + lx_save_cxxflags="$CXXFLAGS" + lx_save_ldflags="$LDFLAGS" + lx_save_libs="$LIBS" + CXXFLAGS="$GLPK_CFLAGS" + LDFLAGS="$GLPK_LDFLAGS" + LIBS="$GLPK_LIBS" + + lx_glpk_test_prog=' + extern "C" { + #include + } + + int main(int argc, char* argv[]) + { + LPX *lp; + lp = lpx_create_prob(); + lpx_delete_prob(lp); + return 0; + }' + + AC_LANG_PUSH(C++) + AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no]) + AC_LANG_POP(C++) + + CXXFLAGS="$lx_save_cxxflags" + LDFLAGS="$lx_save_ldflags" + LIBS="$lx_save_libs" + + if test x"$lx_glpk_found" = x"yes"; then + AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) + AC_MSG_RESULT([yes]) + else + GLPK_CFLAGS="" + GLPK_LDFLAGS="" + GLPK_LIBS="" + AC_MSG_RESULT([no]) + fi + fi + GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS" + AC_SUBST(GLPK_CFLAGS) + AC_SUBST(GLPK_LIBS) + AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"]) +]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/lx_enable_doc.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/lx_enable_doc.m4 Tue Jun 14 20:01:41 2005 +0000 @@ -0,0 +1,28 @@ +AC_DEFUN([LX_ENABLE_DOC], +[ + AC_ARG_ENABLE([doc], +AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@]) +AS_HELP_STRING([--disable-doc], [do not build the documentation]), + [], [enable_doc=yes]) + + AC_MSG_CHECKING([whether to build the documention]) + case "$enable_doc" in + yes) + DOXYGEN_INTERNAL_DOCS=NO + AC_MSG_RESULT([yes]) + ;; + full) + DOXYGEN_INTERNAL_DOCS=YES + AC_MSG_RESULT([full]) + ;; + no) + DOXYGEN_INTERNAL_DOCS=NO + AC_MSG_RESULT([no]) + ;; + *) + AC_MSG_ERROR([bad value $enable_doc for option --enable-doc]) + ;; + esac + AC_SUBST(DOXYGEN_INTERNAL_DOCS) + AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"]) +]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/lx_enable_gui.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/lx_enable_gui.m4 Tue Jun 14 20:01:41 2005 +0000 @@ -0,0 +1,18 @@ +AC_DEFUN([LX_ENABLE_GUI], +[ + AC_ARG_ENABLE([gui], +AS_HELP_STRING([--enable-gui], [build the GUI]) +AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]), + [], [enable_gui=no]) + + AC_MSG_CHECKING([whether to build the GUI]) + if test x"$enable_gui" != x"no"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + if test x"$enable_gui" != x"no"; then + PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0]) + fi + AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"]) +]) diff -r 92755f9a4e2a -r f7e9cc3bc2da config/misc.m4 --- a/config/misc.m4 Tue Jun 14 19:19:59 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -AC_DEFUN([LX_ENABLE_DOCS], -[ - AC_ARG_ENABLE([docs], -AS_HELP_STRING([--enable-docs@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@]) -AS_HELP_STRING([--disable-docs], [do not build the documentation]), - [], [enable_docs=yes]) - - AC_MSG_CHECKING([whether to build the documention]) - case "$enable_docs" in - yes) - DOXYGEN_INTERNAL_DOCS=NO - AC_MSG_RESULT([yes]) - ;; - full) - DOXYGEN_INTERNAL_DOCS=YES - AC_MSG_RESULT([full]) - ;; - no) - DOXYGEN_INTERNAL_DOCS=NO - AC_MSG_RESULT([no]) - ;; - *) - AC_MSG_ERROR([bad value $enable_docs for option --enable-docs]) - ;; - esac - AC_SUBST(DOXYGEN_INTERNAL_DOCS) - AM_CONDITIONAL([WANT_DOCS], [test x"$enable_docs" != x"no"]) -]) - -AC_DEFUN([LX_ENABLE_GUI], -[ - AC_ARG_ENABLE([gui], -AS_HELP_STRING([--enable-gui], [build the GUI]) -AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]), - [], [enable_gui=no]) - - AC_MSG_CHECKING([whether to build the GUI]) - if test x"$enable_gui" != x"no"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - if test x"$enable_gui" != x"no"; then - PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0]) - fi - AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"]) -]) diff -r 92755f9a4e2a -r f7e9cc3bc2da configure.ac --- a/configure.ac Tue Jun 14 19:19:59 2005 +0000 +++ b/configure.ac Tue Jun 14 20:01:41 2005 +0000 @@ -6,9 +6,6 @@ AC_CONFIG_HEADERS([config.h lemon/config.h]) AC_PREREQ([2.59]) -dnl Save user defined CXXFLAGS -dnl lx_user_cxxflags="$CXXFLAGS" - dnl Checks for programs. AC_PROG_CXX AC_PROG_CXXCPP @@ -22,15 +19,12 @@ AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no]) -dnl This is tested only with gcc-3.4 and icc-8.0 -dnl LX_SET_CXXFLAGS - dnl Checks for libraries. LX_CHECK_GLPK LX_CHECK_CPLEX LX_DOCDIR_SUFFIX -LX_ENABLE_DOCS +LX_ENABLE_DOC LX_ENABLE_GUI dnl Checks for header files.