Add HAVE_LP and HAVE_MIP #defines
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 12 Jan 2009 12:22:11 +0000
changeset 45769928a704ffb
parent 456 aff6888e71c9
child 458 7afc121e0689
Add HAVE_LP and HAVE_MIP #defines
configure.ac
lemon/config.h.in
m4/lx_check_cplex.m4
m4/lx_check_glpk.m4
m4/lx_check_soplex.m4
     1.1 --- a/configure.ac	Mon Jan 12 12:22:11 2009 +0000
     1.2 +++ b/configure.ac	Mon Jan 12 12:22:11 2009 +0000
     1.3 @@ -54,6 +54,9 @@
     1.4  #LX_CHECK_CPLEX
     1.5  #LX_CHECK_SOPLEX
     1.6  
     1.7 +AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
     1.8 +AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
     1.9 +
    1.10  dnl Disable/enable building the demo programs.
    1.11  AC_ARG_ENABLE([demo],
    1.12  AS_HELP_STRING([--enable-demo], [build the demo programs])
     2.1 --- a/lemon/config.h.in	Mon Jan 12 12:22:11 2009 +0000
     2.2 +++ b/lemon/config.h.in	Mon Jan 12 12:22:11 2009 +0000
     2.3 @@ -1,3 +1,9 @@
     2.4 +/* Define to 1 if you have any LP solver. */
     2.5 +#undef HAVE_LP
     2.6 +
     2.7 +/* Define to 1 if you have any MIP solver. */
     2.8 +#undef HAVE_MIP
     2.9 +
    2.10  /* Define to 1 if you have CPLEX. */
    2.11  #undef HAVE_CPLEX
    2.12  
     3.1 --- a/m4/lx_check_cplex.m4	Mon Jan 12 12:22:11 2009 +0000
     3.2 +++ b/m4/lx_check_cplex.m4	Mon Jan 12 12:22:11 2009 +0000
     3.3 @@ -62,6 +62,10 @@
     3.4  
     3.5      if test x"$lx_cplex_found" = x"yes"; then
     3.6        AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
     3.7 +      lx_lp_found=yes
     3.8 +      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
     3.9 +      lx_mip_found=yes
    3.10 +      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
    3.11        AC_MSG_RESULT([yes])
    3.12      else
    3.13        CPLEX_CFLAGS=""
     4.1 --- a/m4/lx_check_glpk.m4	Mon Jan 12 12:22:11 2009 +0000
     4.2 +++ b/m4/lx_check_glpk.m4	Mon Jan 12 12:22:11 2009 +0000
     4.3 @@ -60,6 +60,10 @@
     4.4  
     4.5      if test x"$lx_glpk_found" = x"yes"; then
     4.6        AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
     4.7 +      lx_lp_found=yes
     4.8 +      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
     4.9 +      lx_mip_found=yes
    4.10 +      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
    4.11        AC_MSG_RESULT([yes])
    4.12      else
    4.13        GLPK_CFLAGS=""
     5.1 --- a/m4/lx_check_soplex.m4	Mon Jan 12 12:22:11 2009 +0000
     5.2 +++ b/m4/lx_check_soplex.m4	Mon Jan 12 12:22:11 2009 +0000
     5.3 @@ -56,6 +56,8 @@
     5.4  
     5.5      if test x"$lx_soplex_found" = x"yes"; then
     5.6        AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
     5.7 +      lx_lp_found=yes
     5.8 +      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
     5.9        AC_MSG_RESULT([yes])
    5.10      else
    5.11        SOPLEX_CXXFLAGS=""