diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-09-30 15:31:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-09-30 15:31:01 +0200 |
| commit | c462861a73d33083269c367dffbb73ca6cf63c68 (patch) | |
| tree | 076efbf30432669936b7dc6df7f2b90eb0b2534c | |
| parent | 025b20971c0cc5c8df4e773c79af9746e024d2df (diff) | |
| download | curl-c462861a73d33083269c367dffbb73ca6cf63c68.tar.gz | |
configure: don't say HTTPS-proxy is enabled when disabled!
Reported-by: Kamil Dudka
Bug: https://github.com/curl/curl/pull/5735#issuecomment-701376388
| -rwxr-xr-x | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 504b902cc..2304775b1 100755 --- a/configure.ac +++ b/configure.ac @@ -503,6 +503,7 @@ AC_HELP_STRING([--disable-proxy],[Disable proxy support]), AC_MSG_RESULT(no) AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies]) AC_SUBST(CURL_DISABLE_PROXY, [1]) + https_proxy="no" ;; *) AC_MSG_RESULT(yes) ;; @@ -5029,9 +5030,12 @@ 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" \ - -o "x$NSS_ENABLED" = "x1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" +dnl if not explictily turned off, HTTPS-proxy comes with some TLS backends +if test "x$https_proxy" != "xno"; then + if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ + -o "x$NSS_ENABLED" = "x1"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" + fi fi if test "x$ECH_ENABLED" = "x1"; then |