From: Steve Holme <steve_holme@hotmail.com>
Date: Mon, 2 Mar 2020 01:51:49 +0000 (+0000)
Subject: configure.ac: Disable metalink if mbedTLS is specified
X-Git-Tag: curl-7_69_0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18901c7bb7a3a718681267210355ac62d8a3e314;p=thirdparty%2Fcurl.git

configure.ac: Disable metalink if mbedTLS is specified

Follow up to cdcc9df1 and #5006. Even though I mentioned mbedTLS as
being one of the backends that metalink needs to be disabled for, I
seem to have included it in the list of allowed SSL/TLS backends in
comnfigure.ac :(

Closes #5013
---

diff --git a/configure.ac b/configure.ac
index d08553bb7a..e7ad63925e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2771,8 +2771,8 @@ if test X"$OPT_LIBMETALINK" != Xno; then
       want_metalink="no"
     ])
     if test "x$OPENSSL_ENABLED" != "x1" -a "x$USE_WINDOWS_SSPI" != "x1" \
-        -a "x$GNUTLS_ENABLED" != "x1" -a "x$MBEDTLS_ENABLED" != "x1" \
-        -a "x$NSS_ENABLED" != "x1" -a "x$SECURETRANSPORT_ENABLED" != "x1"; then
+        -a "x$GNUTLS_ENABLED" != "x1" -a "x$NSS_ENABLED" != "x1" \
+        -a "x$SECURETRANSPORT_ENABLED" != "x1"; then
       AC_MSG_WARN([metalink support requires a compatible SSL/TLS backend])
       want_metalink="no"
     fi