1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

configure: add MultiSSL to FEATURES when enabled

...for curl-config and its corresponding test 1014
This commit is contained in:
Daniel Stenberg 2017-09-05 10:45:09 +02:00
parent 3130414ce7
commit 889723b004
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2

View File

@ -2471,6 +2471,7 @@ x1)
# one SSL backend is enabled # one SSL backend is enabled
AC_SUBST(SSL_ENABLED) AC_SUBST(SSL_ENABLED)
SSL_ENABLED="1" SSL_ENABLED="1"
AC_MSG_NOTICE([built with one SSL backend])
;; ;;
*) *)
# more than one SSL backend is enabled # more than one SSL backend is enabled
@ -2479,6 +2480,7 @@ x1)
AC_SUBST(CURL_WITH_MULTI_SSL) AC_SUBST(CURL_WITH_MULTI_SSL)
CURL_WITH_MULTI_SSL="1" CURL_WITH_MULTI_SSL="1"
AC_DEFINE(CURL_WITH_MULTI_SSL, 1, [built with multiple SSL backends]) AC_DEFINE(CURL_WITH_MULTI_SSL, 1, [built with multiple SSL backends])
AC_MSG_NOTICE([built with multiple SSL backends])
;; ;;
esac esac
@ -3852,6 +3854,10 @@ if test "x$USE_NGHTTP2" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2"
fi fi
if test "x$CURL_WITH_MULTI_SSL" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES MultiSSL"
fi
if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \
-o "x$NSS_ENABLED" = "x1"; then -o "x$NSS_ENABLED" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy"