1.1 --- a/lemon/lp.h	Mon Jan 12 23:11:39 2009 +0100
     1.2 +++ b/lemon/lp.h	Thu Nov 05 15:48:01 2009 +0100
     1.3 @@ -22,13 +22,13 @@
     1.4  #include<lemon/config.h>
     1.5  
     1.6  
     1.7 -#ifdef HAVE_GLPK
     1.8 +#ifdef LEMON_HAVE_GLPK
     1.9  #include <lemon/glpk.h>
    1.10 -#elif HAVE_CPLEX
    1.11 +#elif LEMON_HAVE_CPLEX
    1.12  #include <lemon/cplex.h>
    1.13 -#elif HAVE_SOPLEX
    1.14 +#elif LEMON_HAVE_SOPLEX
    1.15  #include <lemon/soplex.h>
    1.16 -#elif HAVE_CLP
    1.17 +#elif LEMON_HAVE_CLP
    1.18  #include <lemon/clp.h>
    1.19  #endif
    1.20  
    1.21 @@ -69,20 +69,20 @@
    1.22    ///Currently, it is either \c GlpkMip or \c CplexMip
    1.23    typedef GlpkMip Mip;
    1.24  #else
    1.25 -#ifdef HAVE_GLPK
    1.26 +#ifdef LEMON_HAVE_GLPK
    1.27  # define LEMON_DEFAULT_LP GLPK
    1.28    typedef GlpkLp Lp;
    1.29  # define LEMON_DEFAULT_MIP GLPK
    1.30    typedef GlpkMip Mip;
    1.31 -#elif HAVE_CPLEX
    1.32 +#elif LEMON_HAVE_CPLEX
    1.33  # define LEMON_DEFAULT_LP CPLEX
    1.34    typedef CplexLp Lp;
    1.35  # define LEMON_DEFAULT_MIP CPLEX
    1.36    typedef CplexMip Mip;
    1.37 -#elif HAVE_SOPLEX
    1.38 +#elif LEMON_HAVE_SOPLEX
    1.39  # define DEFAULT_LP SOPLEX
    1.40    typedef SoplexLp Lp;
    1.41 -#elif HAVE_CLP
    1.42 +#elif LEMON_HAVE_CLP
    1.43  # define DEFAULT_LP CLP
    1.44    typedef ClpLp Lp;  
    1.45  #endif