# HG changeset patch # User ladanyi # Date 1114381597 0 # Node ID 49d1ca28ebd83b23107ff94c1a4c4a08ee612730 # Parent 0c4091eeda15209e59760de9494a419f5144d634 Don't set {GLPK,CPLEX}_{CFLAGS,LIBS} if the check fails. diff -r 0c4091eeda15 -r 49d1ca28ebd8 config/lp.m4 --- a/config/lp.m4 Sat Apr 23 17:14:49 2005 +0000 +++ b/config/lp.m4 Sun Apr 24 22:26:37 2005 +0000 @@ -30,9 +30,9 @@ fi GLPK_LIBS="-lglpk" - lx_save_cxxflags="$CXXFLAGS"; - lx_save_ldflags="$LDFLAGS"; - lx_save_libs="$LIBS"; + lx_save_cxxflags="$CXXFLAGS" + lx_save_ldflags="$LDFLAGS" + lx_save_libs="$LIBS" CXXFLAGS="$GLPK_CFLAGS" LDFLAGS="$GLPK_LDFLAGS" LIBS="$GLPK_LIBS" @@ -62,6 +62,9 @@ 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 @@ -104,9 +107,9 @@ fi CPLEX_LIBS="-lcplex -lm -lpthread" - lx_save_cxxflags="$CXXFLAGS"; - lx_save_ldflags="$LDFLAGS"; - lx_save_libs="$LIBS"; + lx_save_cxxflags="$CXXFLAGS" + lx_save_ldflags="$LDFLAGS" + lx_save_libs="$LIBS" CXXFLAGS="$CPLEX_CFLAGS" LDFLAGS="$CPLEX_LDFLAGS" LIBS="$CPLEX_LIBS" @@ -118,7 +121,7 @@ int main(int argc, char* argv[]) { - CPXENVptr env = NULL; + CPXENVptr env = NULL; return 0; }' @@ -134,6 +137,9 @@ 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