diff -r f3792d5bb294 -r 8d289c89d43e lemon/lp.h --- a/lemon/lp.h Wed Apr 29 17:48:18 2009 +0100 +++ b/lemon/lp.h Wed Apr 29 17:48:41 2009 +0100 @@ -22,13 +22,13 @@ #include -#ifdef HAVE_GLPK +#ifdef LEMON_HAVE_GLPK #include -#elif HAVE_CPLEX +#elif LEMON_HAVE_CPLEX #include -#elif HAVE_SOPLEX +#elif LEMON_HAVE_SOPLEX #include -#elif HAVE_CLP +#elif LEMON_HAVE_CLP #include #endif @@ -69,20 +69,20 @@ ///Currently, it is either \c GlpkMip or \c CplexMip typedef GlpkMip Mip; #else -#ifdef HAVE_GLPK +#ifdef LEMON_HAVE_GLPK # define LEMON_DEFAULT_LP GLPK typedef GlpkLp Lp; # define LEMON_DEFAULT_MIP GLPK typedef GlpkMip Mip; -#elif HAVE_CPLEX +#elif LEMON_HAVE_CPLEX # define LEMON_DEFAULT_LP CPLEX typedef CplexLp Lp; # define LEMON_DEFAULT_MIP CPLEX typedef CplexMip Mip; -#elif HAVE_SOPLEX +#elif LEMON_HAVE_SOPLEX # define DEFAULT_LP SOPLEX typedef SoplexLp Lp; -#elif HAVE_CLP +#elif LEMON_HAVE_CLP # define DEFAULT_LP CLP typedef ClpLp Lp; #endif