From: Christian Grothoff Date: Sun, 22 Apr 2012 14:16:25 +0000 (+0000) Subject: -adding improved test for libmicrohttpd X-Git-Tag: initial-import-from-subversion-38251~13845 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0c4bdb23f28a8a7057814ae6aa690c53922ba76;p=oweals%2Fgnunet.git -adding improved test for libmicrohttpd --- diff --git a/configure.ac b/configure.ac index 27fa59104..e42c6bcaf 100644 --- a/configure.ac +++ b/configure.ac @@ -567,7 +567,14 @@ 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), + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + AC_RUN_IFELSE([ + #include "$srcdir/src/include/platform.h" + #include + 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 ]),, [#include "$srcdir/src/include/platform.h"]) @@ -579,7 +586,14 @@ 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), + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + AC_RUN_IFELSE([ + #include "$srcdir/src/include/platform.h" + #include + 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 ]),, [#include "$srcdir/src/include/platform.h"]) @@ -590,7 +604,14 @@ 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), + [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) + AC_RUN_IFELSE([ + #include "$srcdir/src/include/platform.h" + #include + 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 ]),, [#include "$srcdir/src/include/platform.h"])])