Changeset 627:20dac2104519 in lemon-1.2 for m4/lx_check_soplex.m4

Timestamp:

04/28/09 14:51:34 (15 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Parents:

626:58357e986a08 (diff), 500:8a144437db7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge and extend the fix of #275

Files:

• m4/lx_check_soplex.m4 (modified) (3 diffs)
• m4/lx_check_soplex.m4 (modified) (1 diff)

m4/lx_check_soplex.m4

@@ -21 +21 @@
       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
 
@@ -39 +39 @@
 
     lx_soplex_test_prog='
-      #include <soplex/soplex.h>
+      #include <soplex.h>
 
       int main(int argc, char** argv)
@@ -57 +57 @@
     if test x"$lx_soplex_found" = x"yes"; then
       AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+      lx_lp_found=yes
+      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_soplex.m4

@@ -56 +56 @@
 
     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