diff options
| author | wachs <wachs@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-02-27 20:00:08 +0000 |
|---|---|---|
| committer | wachs <wachs@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-02-27 20:00:08 +0000 |
| commit | bc2566fb3ab8134a77484a4c480b172f17e0bac6 (patch) | |
| tree | b1315d54f4338d6e70a0a2964697e24a08c1a5db | |
| parent | 300ab48ea6334113ac67bf2fa3722cd9442b8d2e (diff) | |
enabling libglpk detection
git-svn-id: https://gnunet.org/svn/gnunet@20087 140774ce-b5e7-0310-ab8b-a85725594a96
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index c5af70f159..525f95e66f 100644 --- a/configure.ac +++ b/configure.ac @@ -320,29 +320,21 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) # restore LIBS LIBS=$SAVE_LIBS -AC_ARG_ENABLE([ats], - [AS_HELP_STRING([--enable-ats], [enable ATS code])], - [enable_ats=${enableval}], - [enable_ats=no]) -if test x${enable_ats} = xyes + +AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) +AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) +# GLPK must support atm MLP presolving, version >= 4.32 +AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) +if test x$gplk = xfalse then - AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) - AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) - # GLPK must support atm MLP presolving, version >= 4.32 - AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) - if test x$gplk = xfalse - then - AM_CONDITIONAL(HAVE_LIBGLPK, false) - AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) - else - AM_CONDITIONAL(HAVE_LIBGLPK, true) - AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) - fi -else AM_CONDITIONAL(HAVE_LIBGLPK, false) - AC_MSG_RESULT([no]) + AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) +else + AM_CONDITIONAL(HAVE_LIBGLPK, true) + AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) fi + # test for kvm and kstat (for CPU stats under BSD/Solaris) AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) |