diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-22 14:16:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-22 14:16:25 +0000 |
commit | d0c4bdb23f28a8a7057814ae6aa690c53922ba76 (patch) | |
tree | 19b9196393258ca4c5213664c39eb844818523ff /configure.ac | |
parent | 6460e38ae3550c54413135cc603e5036b50f6ae5 (diff) | |
download | gnunet-d0c4bdb23f28a8a7057814ae6aa690c53922ba76.tar.gz gnunet-d0c4bdb23f28a8a7057814ae6aa690c53922ba76.zip |
-adding improved test for libmicrohttpd
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 27 |
1 files changed, 24 insertions, 3 deletions
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, | |||
567 | AC_CHECK_HEADERS([microhttpd.h], | 567 | AC_CHECK_HEADERS([microhttpd.h], |
568 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 568 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
569 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 569 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
570 | lmhd=1), | 570 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) |
571 | AC_RUN_IFELSE([ | ||
572 | #include "$srcdir/src/include/platform.h" | ||
573 | #include <microhttpd.h> | ||
574 | int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } | ||
575 | ], [ | ||
576 | AC_MSG_RESULT(ok) | ||
577 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | ||
571 | [],[#include "$srcdir/src/include/platform.h" | 578 | [],[#include "$srcdir/src/include/platform.h" |
572 | #include <microhttpd.h>]),, | 579 | #include <microhttpd.h>]),, |
573 | [#include "$srcdir/src/include/platform.h"]) | 580 | [#include "$srcdir/src/include/platform.h"]) |
@@ -579,7 +586,14 @@ AC_ARG_WITH(microhttpd, | |||
579 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 586 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
580 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 587 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
581 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" | 588 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" |
582 | lmhd=1), | 589 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) |
590 | AC_RUN_IFELSE([ | ||
591 | #include "$srcdir/src/include/platform.h" | ||
592 | #include <microhttpd.h> | ||
593 | int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } | ||
594 | ], [ | ||
595 | AC_MSG_RESULT(ok) | ||
596 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | ||
583 | [],[#include "$srcdir/src/include/platform.h" | 597 | [],[#include "$srcdir/src/include/platform.h" |
584 | #include <microhttpd.h>]),, | 598 | #include <microhttpd.h>]),, |
585 | [#include "$srcdir/src/include/platform.h"]) | 599 | [#include "$srcdir/src/include/platform.h"]) |
@@ -590,7 +604,14 @@ AC_ARG_WITH(microhttpd, | |||
590 | AC_CHECK_HEADERS([microhttpd.h], | 604 | AC_CHECK_HEADERS([microhttpd.h], |
591 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 605 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
592 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 606 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
593 | lmhd=1), | 607 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.18]) |
608 | AC_RUN_IFELSE([ | ||
609 | #include "$srcdir/src/include/platform.h" | ||
610 | #include <microhttpd.h> | ||
611 | int main () { return MHD_VERSION >= 0x0091200 ? 0 : 1; } | ||
612 | ], [ | ||
613 | AC_MSG_RESULT(ok) | ||
614 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | ||
594 | [],[#include "$srcdir/src/include/platform.h" | 615 | [],[#include "$srcdir/src/include/platform.h" |
595 | #include <microhttpd.h>]),, | 616 | #include <microhttpd.h>]),, |
596 | [#include "$srcdir/src/include/platform.h"])]) | 617 | [#include "$srcdir/src/include/platform.h"])]) |