- assertions and checks for mantis 2283

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 57dcd36b36d655dfef3b5091eb55d6d368be02aa..e42c6bcaf5832d40c4e06c2e5d9db87cc3bf7d56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -567,10 +567,17 @@ AC_ARG_WITH(microhttpd,
         AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
-              lmhd=1),
-           [],[#include "src/include/platform.h"
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
+              AC_RUN_IFELSE([
+                #include "$srcdir/src/include/platform.h"
+                #include <microhttpd.h>
+                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
+               ], [
+               AC_MSG_RESULT(ok)
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+           [],[#include "$srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "src/include/platform.h"])
+            [#include "$srcdir/src/include/platform.h"])
         ;;
       *)
         LDFLAGS="-L$with_microhttpd/lib $LDFLAGS"
@@ -579,10 +586,17 @@ AC_ARG_WITH(microhttpd,
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
-              lmhd=1),
-           [],[#include "src/include/platform.h"
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
+               AC_RUN_IFELSE([
+                #include "$srcdir/src/include/platform.h"
+                #include <microhttpd.h>
+                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
+               ], [
+               AC_MSG_RESULT(ok)
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+           [],[#include "$srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "src/include/platform.h"])
+            [#include "$srcdir/src/include/platform.h"])
         ;;
     esac
    ],
@@ -590,10 +604,17 @@ AC_ARG_WITH(microhttpd,
     AC_CHECK_HEADERS([microhttpd.h],
       AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
         AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
-          lmhd=1),
-       [],[#include "src/include/platform.h"
+          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18])
+              AC_RUN_IFELSE([
+                #include "$srcdir/src/include/platform.h"
+               #include <microhttpd.h>
+                int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; }
+               ], [
+               AC_MSG_RESULT(ok)
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+       [],[#include "$srcdir/src/include/platform.h"
             #include <microhttpd.h>]),,
-       [#include "src/include/platform.h"])])
+       [#include "$srcdir/src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 
@@ -786,9 +807,9 @@ AC_MSG_RESULT($enable_monkey)
 AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
 if test "x$enable_monkey" = "xyes"
 then
-  MONKEYPREFIX=""
-else
   MONKEYPREFIX="monkey"
+else
+  MONKEYPREFIX=""
 fi
 AC_SUBST(MONKEYPREFIX)