libmicrohttpd

commit 0550c6bd17ef7c186491803aaab0d80655da9fbf
parent f657a09229f26ecfaa8165baf7d4eb90b497558d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 20 Sep 2013 15:01:33 +0000

also check for curl/curl.h header presence when checking for libcurl

Diffstat:
M
configure.ac
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -306,15 +306,17 @@ curl=0
 if test "$enable_curl" = "yes"
 then
   LIBCURL_CHECK_CONFIG(,,curl=1,curl=0)
+  AC_CHECK_HEADERS([curl/curl.h],[
 # Lib cURL & cURL - OpenSSL versions
-  MHD_REQ_CURL_VERSION=7.16.4
-  MHD_REQ_CURL_OPENSSL_VERSION=0.9.8
-  MHD_REQ_CURL_GNUTLS_VERSION=2.8.6
-  MHD_REQ_CURL_NSS_VERSION=3.12.0
-  AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION", [required cURL version to run tests])
-  AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION], "$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests])
-  AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION], "$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with cURL])
-  AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION", [NSS lib version - used in conjunction with cURL])
+   MHD_REQ_CURL_VERSION=7.16.4
+   MHD_REQ_CURL_OPENSSL_VERSION=0.9.8
+   MHD_REQ_CURL_GNUTLS_VERSION=2.8.6
+   MHD_REQ_CURL_NSS_VERSION=3.12.0
+   AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION", [required cURL version to run tests])
+   AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION], "$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests])
+   AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION], "$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with cURL])
+   AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION", [NSS lib version - used in conjunction with cURL])
+ ],[curl=0])
 fi
 
 AC_MSG_CHECKING(for magic_open -lmagic)