diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 7416deda7..8f7bbac4f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -250,29 +250,27 @@ 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 | AC_ARG_ENABLE([ats], |
254 | 254 | [AS_HELP_STRING([--enable-ats], [enable ATS code])], | |
255 | if test x$USE_ATS = xtrue | 255 | [enable_ats=${enableval}], |
256 | [enable_ats=no]) | ||
257 | if test x${enable_ats} = xyes | ||
256 | then | 258 | then |
257 | glpk=true | 259 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) |
258 | AC_MSG_WARN([ATS enabled]) | 260 | AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false]) |
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 | 261 | # GLPK must support atm MLP presolving, version >= 4.32 |
262 | AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) | 262 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) |
263 | if test x$gplk = xfalse | 263 | if test x$gplk = xfalse |
264 | then | 264 | then |
265 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 265 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
266 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) | ||
267 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) | 266 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) |
268 | else | 267 | else |
269 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 268 | AM_CONDITIONAL(HAVE_LIBGLPK, true) |
270 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) | 269 | AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) |
271 | fi | 270 | fi |
272 | else | 271 | else |
273 | AC_MSG_WARN([ATS disabled]) | ||
274 | AM_CONDITIONAL(HAVE_GLPK, false) | ||
275 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | 272 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
273 | AC_MSG_RESULT([no]) | ||
276 | fi | 274 | fi |
277 | 275 | ||
278 | # test for kvm and kstat (for CPU stats under BSD/Solaris) | 276 | # test for kvm and kstat (for CPU stats under BSD/Solaris) |