[Lemon-commits] Alpar Juttner: Fix buggy include logic in lemon/...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/5de6a70446f6
changeset: 1323:5de6a70446f6
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Jul 09 14:41:36 2014 +0200
description:
	Fix buggy include logic in lemon/lp.h (#503)

diffstat:

 lemon/lp.h |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (28 lines):

diff --git a/lemon/lp.h b/lemon/lp.h
--- a/lemon/lp.h
+++ b/lemon/lp.h
@@ -22,15 +22,19 @@
 #include<lemon/config.h>
 
 
-#ifdef LEMON_HAVE_GLPK
+#if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
 #include <lemon/glpk.h>
-#elif LEMON_HAVE_CPLEX
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX 
 #include <lemon/cplex.h>
-#elif LEMON_HAVE_SOPLEX
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_SOPLEX
 #include <lemon/soplex.h>
-#elif LEMON_HAVE_CLP
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_CLP
 #include <lemon/clp.h>
-#elif LEMON_HAVE_CBC
+#endif
+#if LEMON_DEFAULT_MIP == _LEMON_CBC
 #include <lemon/cbc.h>
 #endif