1.1 --- a/m4/lx_check_soplex.m4	Mon Jan 12 23:11:39 2009 +0100
     1.2 +++ b/m4/lx_check_soplex.m4	Thu Nov 05 15:48:01 2009 +0100
     1.3 @@ -20,7 +20,7 @@
     1.4      if test x"$with_soplex_includedir" != x"no"; then
     1.5        SOPLEX_CXXFLAGS="-I$with_soplex_includedir"
     1.6      elif test x"$with_soplex" != x"yes"; then
     1.7 -      SOPLEX_CXXFLAGS="-I$with_soplex/include"
     1.8 +      SOPLEX_CXXFLAGS="-I$with_soplex/src"
     1.9      fi
    1.10  
    1.11      if test x"$with_soplex_libdir" != x"no"; then
    1.12 @@ -38,7 +38,7 @@
    1.13      LIBS="$SOPLEX_LIBS"
    1.14  
    1.15      lx_soplex_test_prog='
    1.16 -      #include <soplex/soplex.h>
    1.17 +      #include <soplex.h>
    1.18  
    1.19        int main(int argc, char** argv)
    1.20        {
    1.21 @@ -55,9 +55,9 @@
    1.22      LIBS="$lx_save_libs"
    1.23  
    1.24      if test x"$lx_soplex_found" = x"yes"; then
    1.25 -      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
    1.26 +      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
    1.27        lx_lp_found=yes
    1.28 -      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
    1.29 +      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
    1.30        AC_MSG_RESULT([yes])
    1.31      else
    1.32        SOPLEX_CXXFLAGS=""