diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-25 15:37:04 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-25 15:37:04 +0000 |
commit | 0471629eb7316745f5cf0a46f0cadf06578c4e81 (patch) | |
tree | ccb773c716928f4b8a29debbe81289b0d06be4ba /configure.ac | |
parent | a8698c1dc9200d021e0aa38ae1dcad6a44e57a6d (diff) | |
download | gnunet-0471629eb7316745f5cf0a46f0cadf06578c4e81.tar.gz gnunet-0471629eb7316745f5cf0a46f0cadf06578c4e81.zip |
check for glpk >= 4.32
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b3a965e3b..f89f8e185 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -259,10 +259,13 @@ fi # $build = $target | |||
259 | glpk=true | 259 | glpk=true |
260 | AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) | 260 | AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) |
261 | AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) | 261 | AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false]) |
262 | # GLPK must support atm MLP presolving, version >= 4.32 | ||
263 | AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) | ||
262 | if test $gplk == false | 264 | if test $gplk == false |
263 | then | 265 | then |
264 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 266 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) |
265 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) | 267 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk]) |
268 | AC_MSG_ERROR([GNUnet requires GLPK >= 4.32]) | ||
266 | else | 269 | else |
267 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 270 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) |
268 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) | 271 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) |