diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2db474684..a73df0cb3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -724,8 +724,8 @@ AC_MSG_RESULT([$conversation_backend]) | |||
724 | # account when checking for curl. | 724 | # account when checking for curl. |
725 | AC_CHECK_LIB([curl-gnutls], | 725 | AC_CHECK_LIB([curl-gnutls], |
726 | [curl_easy_getinfo], | 726 | [curl_easy_getinfo], |
727 | [curl_gnutls=1 | 727 | [LIBCURL="-lcurl-gnutls" |
728 | LIBCURL="-lcurl-gnutls"], | 728 | curl_gnutls=1], |
729 | [curl_gnutls=0]) | 729 | [curl_gnutls=0]) |
730 | 730 | ||
731 | LIBCURL_CHECK_CONFIG([], [7.34.0], [], | 731 | LIBCURL_CHECK_CONFIG([], [7.34.0], [], |
@@ -1495,10 +1495,13 @@ AS_IF([test "x$png" = "x1"], | |||
1495 | [libpng_msg="yes"], | 1495 | [libpng_msg="yes"], |
1496 | [libpng_msg="no"]) | 1496 | [libpng_msg="no"]) |
1497 | 1497 | ||
1498 | # curl or gnurl | 1498 | # We get the supported backend(s) from curl-config unless we linked |
1499 | AS_IF([test "x$curl_gnutls" = "x1"], | 1499 | # against libcurl-gnutls directly, in which case we manually set it just to be |
1500 | [http_client="curl-gnutls"], | 1500 | # sure curl-config is not linked against another curl. |
1501 | [http_client="curl-openssl"]) | 1501 | AS_IF([test "x$curl_gnutls" = "x0"], |
1502 | [AC_CHECK_PROG([CURL_SSL_BACKEND], ["curl-config"], [m4_esyscmd_s(curl-config --ssl-backends)]) | ||
1503 | http_client="curl ($CURL_SSL_BACKEND)"], | ||
1504 | [http_client="curl (GnuTLS)"]) | ||
1502 | 1505 | ||
1503 | # ifconfig | 1506 | # ifconfig |
1504 | AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"], | 1507 | AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"], |