diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index dcbe980be..3373b1a12 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -250,24 +250,31 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) | |||
250 | # restore LIBS | 250 | # restore LIBS |
251 | LIBS=$SAVE_LIBS | 251 | LIBS=$SAVE_LIBS |
252 | 252 | ||
253 | USE_ATS=false | ||
253 | 254 | ||
254 | glpk=true | 255 | if test x$USE_ATS = xtrue |
255 | # AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) | ||
256 | # AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) | ||
257 | # GLPK must support atm MLP presolving, version >= 4.32 | ||
258 | # AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) | ||
259 | if test x$gplk = xfalse | ||
260 | then | 256 | then |
261 | # AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 257 | glpk=true |
262 | # AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) | 258 | AC_MSG_WARN([ATS enabled]) |
263 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) | 259 | AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) |
260 | AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) | ||
261 | # GLPK must support atm MLP presolving, version >= 4.32 | ||
262 | AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) | ||
263 | if test x$gplk = xfalse | ||
264 | then | ||
265 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | ||
266 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) | ||
267 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) | ||
268 | else | ||
269 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | ||
270 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) | ||
271 | AC_MSG_WARN([GLPK is installed]) | ||
272 | fi | ||
264 | else | 273 | else |
265 | # AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 274 | AC_MSG_WARN([ATS disabled]) |
266 | # AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) | 275 | AM_CONDITIONAL(HAVE_GLPK, false) |
267 | AC_MSG_WARN([GLPK is installed]) | 276 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
268 | fi | 277 | fi |
269 | AM_CONDITIONAL(HAVE_GLPK, false) | ||
270 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | ||
271 | 278 | ||
272 | # test for kvm and kstat (for CPU stats under BSD/Solaris) | 279 | # test for kvm and kstat (for CPU stats under BSD/Solaris) |
273 | AC_CHECK_LIB([kvm],[kvm_open]) | 280 | AC_CHECK_LIB([kvm],[kvm_open]) |