diff options
| author | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-25 16:03:37 +0000 |
|---|---|---|
| committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-25 16:03:37 +0000 |
| commit | 8f85c17c3719c01e608b1c04a0a716b50025b96f (patch) | |
| tree | a3a0398a169ea04b89a9551fe4ccafbd4d0f6cd8 | |
| parent | 0471629eb7316745f5cf0a46f0cadf06578c4e81 (diff) | |
| download | gnunet-8f85c17c3719c01e608b1c04a0a716b50025b96f.tar.gz gnunet-8f85c17c3719c01e608b1c04a0a716b50025b96f.zip | |
error -> warn
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f89f8e185..3b8b324f5 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -261,11 +261,11 @@ 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 | 262 | # GLPK must support atm MLP presolving, version >= 4.32 |
| 263 | AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) | 263 | AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]]) |
| 264 | if test $gplk == false | 264 | if test $gplk = false |
| 265 | then | 265 | then |
| 266 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 266 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) |
| 267 | 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]) | 268 | AC_MSG_WARN([GNUnet requires GLPK >= 4.32]) |
| 269 | else | 269 | else |
| 270 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) | 270 | AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue]) |
| 271 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) | 271 | AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk]) |