diff -r c35afa9e89e7 -r ef88c0a30f85 m4/lx_check_soplex.m4 --- a/m4/lx_check_soplex.m4 Mon Jan 12 23:11:39 2009 +0100 +++ b/m4/lx_check_soplex.m4 Thu Nov 05 15:48:01 2009 +0100 @@ -20,7 +20,7 @@ if test x"$with_soplex_includedir" != x"no"; then SOPLEX_CXXFLAGS="-I$with_soplex_includedir" elif test x"$with_soplex" != x"yes"; then - SOPLEX_CXXFLAGS="-I$with_soplex/include" + SOPLEX_CXXFLAGS="-I$with_soplex/src" fi if test x"$with_soplex_libdir" != x"no"; then @@ -38,7 +38,7 @@ LIBS="$SOPLEX_LIBS" lx_soplex_test_prog=' - #include + #include int main(int argc, char** argv) { @@ -55,9 +55,9 @@ LIBS="$lx_save_libs" if test x"$lx_soplex_found" = x"yes"; then - AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) + AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) lx_lp_found=yes - AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.]) + AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) AC_MSG_RESULT([yes]) else SOPLEX_CXXFLAGS=""