diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-16 23:26:49 -0400 |
|---|---|---|
| committer | lianah <lianahady@gmail.com> | 2014-06-19 18:24:39 -0400 |
| commit | 2faa605e3935f2d2048309934c307b7dc8546241 (patch) | |
| tree | 445d0209365aa06b490d698502470a3834cbc0b2 /config | |
| parent | 7d7012526f681e9f0a5db0760baa2e4e9de6602b (diff) | |
Clean up glpk detection a little, fix a detection bug.
Diffstat (limited to 'config')
| -rw-r--r-- | config/glpk.m4 | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/config/glpk.m4 b/config/glpk.m4 index c5592ab19..cc2a3be71 100644 --- a/config/glpk.m4 +++ b/config/glpk.m4 @@ -34,10 +34,7 @@ elif test "$with_glpk" = yes; then dnl Try a bunch of combinations until something works :-/ GLPK_LIBS= - AC_CHECK_HEADERS([glpk/glpk.h glpk.h], [break]) - if test x$ac_cv_header_glpk_glpk_h = xno && test x$ac_cv_header_glpk_h = xno; then - AC_MSG_FAILURE([cannot find glpk.h, the GLPK header!]) - fi + AC_CHECK_HEADER([glpk.h], [], [AC_MSG_FAILURE([cannot find glpk.h, the GLPK header!])]) AC_MSG_CHECKING([how to link glpk]) CVC4_TRY_GLPK_WITH([]) CVC4_TRY_GLPK_WITH([-lgmp]) @@ -115,11 +112,7 @@ if test -z "$GLPK_LIBS"; then CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS" LDFLAGS="$GLPK_LDFLAGS $LDFLAGS" LIBS="-lglpk $1" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#ifdef HAVE_GLPK_GLPK_H] - [#include <glpk/glpk.h>] - [#else] - [#include <glpk.h>] - [#endif], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>], [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])], [GLPK_LIBS="-lglpk $1"], []) @@ -139,22 +132,14 @@ if test -z "$GLPK_LIBS"; then cvc4_save_LIBS="$LIBS" cvc4_save_CPPFLAGS="$CPPFLAGS" cvc4_save_LDFLAGS="$LDFLAGS" - CPPFLAGS="$CVC4_CPPFLAGS $CPPFLAGS" + CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS" LDFLAGS="-static $GLPK_LDFLAGS $LDFLAGS" LIBS="-lglpk-static $1" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#ifdef HAVE_GLPK_GLPK_H] - [#include <glpk/glpk.h>] - [#else] - [#include <glpk.h>] - [#endif], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>], [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])], [GLPK_LIBS="-lglpk-static $1"], [ LIBS="-lglpk $1" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#ifdef HAVE_GLPK_GLPK_H] - [#include <glpk/glpk.h>] - [#else] - [#include <glpk.h>] - [#endif], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>], [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])], [GLPK_LIBS="-lglpk $1"]) ]) |