diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-23 17:38:20 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-23 17:38:20 -0400 |
| commit | c948e9517b7b5f0bacb055ab2ad320f889c3fb49 (patch) | |
| tree | d6ab0a55e2350b09b25f8e8dd340be0ddd9b429b /config | |
| parent | 55ca82cf4c48911e7cdad7f82b58497ba9822579 (diff) | |
Fix header check for glpk.h.
Diffstat (limited to 'config')
| -rw-r--r-- | config/glpk.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/glpk.m4 b/config/glpk.m4 index cc2a3be71..2799d5a77 100644 --- a/config/glpk.m4 +++ b/config/glpk.m4 @@ -34,7 +34,13 @@ elif test "$with_glpk" = yes; then dnl Try a bunch of combinations until something works :-/ GLPK_LIBS= + AC_LANG_PUSH([C++]) + cvc4_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS" AC_CHECK_HEADER([glpk.h], [], [AC_MSG_FAILURE([cannot find glpk.h, the GLPK header!])]) + CPPFLAGS="$cvc4_save_CPPFLAGS" + AC_LANG_POP([C++]) + AC_MSG_CHECKING([how to link glpk]) CVC4_TRY_GLPK_WITH([]) CVC4_TRY_GLPK_WITH([-lgmp]) @@ -107,7 +113,7 @@ AC_DEFUN([CVC4_TRY_GLPK_WITH], [ if test -z "$GLPK_LIBS"; then AC_LANG_PUSH([C++]) cvc4_save_LIBS="$LIBS" - cvc4_save_CPPFLAGS="$LDFLAGS" + cvc4_save_CPPFLAGS="$CPPFLAGS" cvc4_save_LDFLAGS="$LDFLAGS" CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS" LDFLAGS="$GLPK_LDFLAGS $LDFLAGS" |