diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-04-04 19:44:45 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-04-04 19:44:45 +0200 |
commit | aa3b3f27f1dfa5fa970b468a1b797ae42809c134 (patch) | |
tree | a650ca05f387a02bf7ba568e062370de9bb1533c | |
parent | 60e93b8f0dd03c30d652b0fa665e4cd15b234f0f (diff) | |
download | gnunet-aa3b3f27f1dfa5fa970b468a1b797ae42809c134.tar.gz gnunet-aa3b3f27f1dfa5fa970b468a1b797ae42809c134.zip |
BUILD: Simplify mhd detection
-rw-r--r-- | configure.ac | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 43d112572..8f74d5749 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1028,19 +1028,12 @@ CPPFLAGS="$SAVE_CPPFLAGS" | |||
1028 | AC_ARG_WITH([microhttpd], | 1028 | AC_ARG_WITH([microhttpd], |
1029 | [AS_HELP_STRING([--with-microhttpd=PFX], | 1029 | [AS_HELP_STRING([--with-microhttpd=PFX], |
1030 | [base of libmicrohttpd installation])], | 1030 | [base of libmicrohttpd installation])], |
1031 | [httpd=${withval}], | ||
1032 | [httpd=check]) | ||
1033 | |||
1034 | AS_CASE([$withval], | ||
1035 | [no], | ||
1036 | [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63])], | ||
1037 | [yes], | ||
1038 | [PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0])], | ||
1039 | [SAVE_PKG_PATH="$PKG_CONFIG_PATH" | 1031 | [SAVE_PKG_PATH="$PKG_CONFIG_PATH" |
1040 | PKG_CONFIG_PATH="$httpd/lib/pkgconfig" | 1032 | PKG_CONFIG_PATH="$httpd/lib/pkgconfig" |
1041 | export PKG_CONFIG_PATH | 1033 | export PKG_CONFIG_PATH |
1042 | PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0]) | 1034 | PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0]) |
1043 | PKG_CONFIG_PATH="$SAVE_PKG_PATH"]) | 1035 | PKG_CONFIG_PATH="$SAVE_PKG_PATH"], |
1036 | [PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0])]) | ||
1044 | 1037 | ||
1045 | AS_IF([test "x$libmhd" = "x0"], | 1038 | AS_IF([test "x$libmhd" = "x0"], |
1046 | [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63])]) | 1039 | [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63])]) |