Changes in lemon/lp.h [674:20dac2104519:485:9b082b3fb33f] in lemon

File:

• lemon/lp.h (modified) (2 diffs)

lemon/lp.h

@@ -23 +23 @@
 
 
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
 #include <lemon/glpk.h>
-#elif LEMON_HAVE_CPLEX
+#elif HAVE_CPLEX
 #include <lemon/cplex.h>
-#elif LEMON_HAVE_SOPLEX
+#elif HAVE_SOPLEX
 #include <lemon/soplex.h>
-#elif LEMON_HAVE_CLP
+#elif HAVE_CLP
 #include <lemon/clp.h>
 #endif
@@ -70 +70 @@
   typedef GlpkMip Mip;
 #else
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
 # define LEMON_DEFAULT_LP GLPK
   typedef GlpkLp Lp;
 # define LEMON_DEFAULT_MIP GLPK
   typedef GlpkMip Mip;
-#elif LEMON_HAVE_CPLEX
+#elif HAVE_CPLEX
 # define LEMON_DEFAULT_LP CPLEX
   typedef CplexLp Lp;
 # define LEMON_DEFAULT_MIP CPLEX
   typedef CplexMip Mip;
-#elif LEMON_HAVE_SOPLEX
+#elif HAVE_SOPLEX
 # define DEFAULT_LP SOPLEX
   typedef SoplexLp Lp;
-#elif LEMON_HAVE_CLP
+#elif HAVE_CLP
 # define DEFAULT_LP CLP
   typedef ClpLp Lp;