aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac17
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 6697cdfbb..dcbe980be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,19 +252,22 @@ LIBS=$SAVE_LIBS
252 252
253 253
254glpk=true 254glpk=true
255AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) 255# AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
256AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) 256# AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
257# GLPK must support atm MLP presolving, version >= 4.32 257# GLPK must support atm MLP presolving, version >= 4.32
258AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) 258# AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
259if test x$gplk = xfalse 259if test x$gplk = xfalse
260then 260then
261 AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) 261# AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
262 AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) 262# AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
263 AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) 263 AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
264else 264else
265 AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) 265# AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
266 AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) 266# AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
267 AC_MSG_WARN([GLPK is installed])
267fi 268fi
269AM_CONDITIONAL(HAVE_GLPK, false)
270AM_CONDITIONAL(HAVE_LIBGLPK, false)
268 271
269# test for kvm and kstat (for CPU stats under BSD/Solaris) 272# test for kvm and kstat (for CPU stats under BSD/Solaris)
270AC_CHECK_LIB([kvm],[kvm_open]) 273AC_CHECK_LIB([kvm],[kvm_open])