diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 86e1f2c72..55ae95c8b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -337,6 +337,7 @@ else | |||
337 | AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation]) | 337 | AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation]) |
338 | fi | 338 | fi |
339 | 339 | ||
340 | # FIXME: Something is wrong about this in the output of ./configure runs | ||
340 | AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation) | 341 | AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation) |
341 | AC_ARG_ENABLE([texi2mdoc-generation], | 342 | AC_ARG_ENABLE([texi2mdoc-generation], |
342 | [AS_HELP_STRING([--disable-texi2mdoc-generation], [do not include generated texi2mdoc output in installation])], | 343 | [AS_HELP_STRING([--disable-texi2mdoc-generation], [do not include generated texi2mdoc output in installation])], |
@@ -693,12 +694,12 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1]) | |||
693 | LIBS=$SAVE_LIBS | 694 | LIBS=$SAVE_LIBS |
694 | CPPFLAGS=$SAVE_CPPFLAGS | 695 | CPPFLAGS=$SAVE_CPPFLAGS |
695 | 696 | ||
696 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) | 697 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false]) |
697 | # GLPK must support glpk_init_env, version >= 4.43 | 698 | # GLPK must support glpk_init_env, version >= 4.43 |
698 | AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) | 699 | AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) |
699 | # GLPK must support atm MLP presolving, version >= 4.32 | 700 | # GLPK must support atm MLP presolving, version >= 4.32 |
700 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) | 701 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]]) |
701 | if test x$gplk = xfalse | 702 | if test "x$glpk" = xfalse |
702 | then | 703 | then |
703 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | 704 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
704 | AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) | 705 | AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) |