diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 20:00:08 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 20:00:08 +0000 |
commit | db15453e3a55d8d47a9a2fc0d7982fed18186312 (patch) | |
tree | b1315d54f4338d6e70a0a2964697e24a08c1a5db /configure.ac | |
parent | 58994855d607c4a7514af07c61c91af7db99637f (diff) | |
download | gnunet-db15453e3a55d8d47a9a2fc0d7982fed18186312.tar.gz gnunet-db15453e3a55d8d47a9a2fc0d7982fed18186312.zip |
enabling libglpk detection
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index c5af70f15..525f95e66 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])) | |||
320 | # restore LIBS | 320 | # restore LIBS |
321 | LIBS=$SAVE_LIBS | 321 | LIBS=$SAVE_LIBS |
322 | 322 | ||
323 | AC_ARG_ENABLE([ats], | 323 | |
324 | [AS_HELP_STRING([--enable-ats], [enable ATS code])], | 324 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) |
325 | [enable_ats=${enableval}], | 325 | AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) |
326 | [enable_ats=no]) | 326 | # GLPK must support atm MLP presolving, version >= 4.32 |
327 | if test x${enable_ats} = xyes | 327 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) |
328 | if test x$gplk = xfalse | ||
328 | then | 329 | then |
329 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) | ||
330 | AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) | ||
331 | # GLPK must support atm MLP presolving, version >= 4.32 | ||
332 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) | ||
333 | if test x$gplk = xfalse | ||
334 | then | ||
335 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | ||
336 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) | ||
337 | else | ||
338 | AM_CONDITIONAL(HAVE_LIBGLPK, true) | ||
339 | AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) | ||
340 | fi | ||
341 | else | ||
342 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | 330 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
343 | AC_MSG_RESULT([no]) | 331 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) |
332 | else | ||
333 | AM_CONDITIONAL(HAVE_LIBGLPK, true) | ||
334 | AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) | ||
344 | fi | 335 | fi |
345 | 336 | ||
337 | |||
346 | # test for kvm and kstat (for CPU stats under BSD/Solaris) | 338 | # test for kvm and kstat (for CPU stats under BSD/Solaris) |
347 | AC_CHECK_LIB([kvm],[kvm_open]) | 339 | AC_CHECK_LIB([kvm],[kvm_open]) |
348 | AC_CHECK_LIB([kstat],[kstat_open]) | 340 | AC_CHECK_LIB([kstat],[kstat_open]) |