[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -improve curl detection more
From: |
gnunet |
Subject: |
[gnunet] branch master updated: -improve curl detection more |
Date: |
Wed, 07 Sep 2022 08:31:55 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 4c7564640 -improve curl detection more
4c7564640 is described below
commit 4c7564640ca1f6d76a9f34cb86d221736d1cb7e0
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Sep 7 08:31:52 2022 +0200
-improve curl detection more
---
configure.ac | 15 +++++++++------
1 file 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])
# account when checking for curl.
AC_CHECK_LIB([curl-gnutls],
[curl_easy_getinfo],
- [curl_gnutls=1
- LIBCURL="-lcurl-gnutls"],
+ [LIBCURL="-lcurl-gnutls"
+ curl_gnutls=1],
[curl_gnutls=0])
LIBCURL_CHECK_CONFIG([], [7.34.0], [],
@@ -1495,10 +1495,13 @@ AS_IF([test "x$png" = "x1"],
[libpng_msg="yes"],
[libpng_msg="no"])
-# curl or gnurl
-AS_IF([test "x$curl_gnutls" = "x1"],
- [http_client="curl-gnutls"],
- [http_client="curl-openssl"])
+# We get the supported backend(s) from curl-config unless we linked
+# against libcurl-gnutls directly, in which case we manually set it just to be
+# sure curl-config is not linked against another curl.
+AS_IF([test "x$curl_gnutls" = "x0"],
+ [AC_CHECK_PROG([CURL_SSL_BACKEND], ["curl-config"],
[m4_esyscmd_s(curl-config --ssl-backends)])
+ http_client="curl ($CURL_SSL_BACKEND)"],
+ [http_client="curl (GnuTLS)"])
# ifconfig
AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -improve curl detection more,
gnunet <=