diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-09-20 15:01:33 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-09-20 15:01:33 +0000 |
| commit | 0550c6bd17ef7c186491803aaab0d80655da9fbf (patch) | |
| tree | 05c6d958e23f75eb1e13f116c75b3e95bd7afa4d | |
| parent | f657a09229f26ecfaa8165baf7d4eb90b497558d (diff) | |
| download | libmicrohttpd-0550c6bd17ef7c186491803aaab0d80655da9fbf.tar.gz libmicrohttpd-0550c6bd17ef7c186491803aaab0d80655da9fbf.zip | |
also check for curl/curl.h header presence when checking for libcurl
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 502d30a1..71bbabf8 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -306,15 +306,17 @@ curl=0 | |||
| 306 | if test "$enable_curl" = "yes" | 306 | if test "$enable_curl" = "yes" |
| 307 | then | 307 | then |
| 308 | LIBCURL_CHECK_CONFIG(,,curl=1,curl=0) | 308 | LIBCURL_CHECK_CONFIG(,,curl=1,curl=0) |
| 309 | AC_CHECK_HEADERS([curl/curl.h],[ | ||
| 309 | # Lib cURL & cURL - OpenSSL versions | 310 | # Lib cURL & cURL - OpenSSL versions |
| 310 | MHD_REQ_CURL_VERSION=7.16.4 | 311 | MHD_REQ_CURL_VERSION=7.16.4 |
| 311 | MHD_REQ_CURL_OPENSSL_VERSION=0.9.8 | 312 | MHD_REQ_CURL_OPENSSL_VERSION=0.9.8 |
| 312 | MHD_REQ_CURL_GNUTLS_VERSION=2.8.6 | 313 | MHD_REQ_CURL_GNUTLS_VERSION=2.8.6 |
| 313 | MHD_REQ_CURL_NSS_VERSION=3.12.0 | 314 | MHD_REQ_CURL_NSS_VERSION=3.12.0 |
| 314 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION", [required cURL version to run tests]) | 315 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION", [required cURL version to run tests]) |
| 315 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION], "$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests]) | 316 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION], "$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests]) |
| 316 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION], "$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with cURL]) | 317 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION], "$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with cURL]) |
| 317 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION", [NSS lib version - used in conjunction with cURL]) | 318 | AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION", [NSS lib version - used in conjunction with cURL]) |
| 319 | ],[curl=0]) | ||
| 318 | fi | 320 | fi |
| 319 | 321 | ||
| 320 | AC_MSG_CHECKING(for magic_open -lmagic) | 322 | AC_MSG_CHECKING(for magic_open -lmagic) |