diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-06-01 09:28:51 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-06-01 09:28:51 +0000 |
commit | b77b46e3c7b531460391ce8e04098084cb81b829 (patch) | |
tree | f4c1e871291d8bd6d54e575a5cf7df16221a033b /configure.ac | |
parent | 16fadb07d078ec5bce5a3d8b498fbc9d0838b9e8 (diff) | |
download | gnunet-b77b46e3c7b531460391ce8e04098084cb81b829.tar.gz gnunet-b77b46e3c7b531460391ce8e04098084cb81b829.zip |
better fix for #3805
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index fc82456e9..73c557e5b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -855,16 +855,17 @@ AC_ARG_WITH(microhttpd, | |||
855 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 855 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
856 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | 856 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], |
857 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) | 857 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) |
858 | AC_RUN_IFELSE([AC_LANG_SOURCE([ | 858 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([ |
859 | #include "$native_srcdir/src/include/platform.h" | 859 | #include "$native_srcdir/src/include/platform.h" |
860 | #include <microhttpd.h> | 860 | #include <microhttpd.h> |
861 | int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } | 861 | #if (MHD_VERSION < 0x0093200) |
862 | #error needs at least version 0.9.32 | ||
863 | #endif | ||
864 | int main () { return 0; } | ||
862 | ])], | 865 | ])], |
863 | [AC_MSG_RESULT(ok) | 866 | [AC_MSG_RESULT(ok) |
864 | lmhd=1], | 867 | lmhd=1], |
865 | [AC_MSG_RESULT(failed)], | 868 | [AC_MSG_RESULT(failed)])]), |
866 | [AC_MSG_RESULT(cross-compiling, assuming OK) | ||
867 | lmhd=1])]), | ||
868 | [],[#include "$native_srcdir/src/include/platform.h" | 869 | [],[#include "$native_srcdir/src/include/platform.h" |
869 | #include <microhttpd.h>]),, | 870 | #include <microhttpd.h>]),, |
870 | [#include "$native_srcdir/src/include/platform.h"]) | 871 | [#include "$native_srcdir/src/include/platform.h"]) |
@@ -877,16 +878,17 @@ AC_ARG_WITH(microhttpd, | |||
877 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | 878 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], |
878 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" | 879 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" |
879 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) | 880 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) |
880 | AC_RUN_IFELSE([AC_LANG_SOURCE([ | 881 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([ |
881 | #include "$native_srcdir/src/include/platform.h" | 882 | #include "$native_srcdir/src/include/platform.h" |
882 | #include <microhttpd.h> | 883 | #include <microhttpd.h> |
883 | int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } | 884 | #if (MHD_VERSION < 0x0093200) |
885 | #error needs at least version 0.9.32 | ||
886 | #endif | ||
887 | int main () { return 0; } | ||
884 | ])], | 888 | ])], |
885 | [AC_MSG_RESULT(ok) | 889 | [AC_MSG_RESULT(ok) |
886 | lmhd=1], | 890 | lmhd=1], |
887 | [AC_MSG_RESULT(failed)], | 891 | [AC_MSG_RESULT(failed)])]), |
888 | [AC_MSG_RESULT(cross-compiling, assuming OK) | ||
889 | lmhd=1])]), | ||
890 | [],[#include "$native_srcdir/src/include/platform.h" | 892 | [],[#include "$native_srcdir/src/include/platform.h" |
891 | #include <microhttpd.h>]),, | 893 | #include <microhttpd.h>]),, |
892 | [#include "$native_srcdir/src/include/platform.h"]) | 894 | [#include "$native_srcdir/src/include/platform.h"]) |