diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-09-04 23:41:07 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-05 22:28:18 +0200 |
| commit | 9829b9436150ac28de8bb18734a1846557247be7 (patch) | |
| tree | 01c36d36bba49ce70973870a960b7402cb659806 /configure.ac | |
| parent | c1f7a7b5257c4bb28d78189e464b1db253d0a93c (diff) | |
| download | curl-9829b9436150ac28de8bb18734a1846557247be7.tar.gz | |
configure: make --disable-hsts work
The AC_ARG_ENABLE() macro itself uses a variable called
'enable_[option]', so when our script also used a variable with that
name for the purpose of storing what the user wants, it also
accidentally made it impossible to switch off the feature with
--disable-hsts. Fix this by renaming our variable.
Reported-by: Michał Antoniak
Fixes #7669
Closes #7672
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 694a16cba..34ec0efd3 100644 --- a/configure.ac +++ b/configure.ac @@ -172,7 +172,7 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_h3_msg="no (--with-ngtcp2, --with-quiche)" enable_altsvc="yes" -enable_hsts="yes" +hsts="yes" dnl dnl Save some initial values the user might have provided @@ -534,7 +534,7 @@ AS_HELP_STRING([--disable-http],[Disable HTTP support]), curl_altsvc_msg="no"; curl_hsts_msg="no (--enable-hsts)"; enable_altsvc="no" - enable_hsts="no" + hsts="no" ;; *) AC_MSG_RESULT(yes) ;; @@ -3901,19 +3901,19 @@ if test -n "$SSL_ENABLED"; then [ case "$enableval" in no) AC_MSG_RESULT(no) - enable_hsts="no" + hsts="no" ;; *) AC_MSG_RESULT(yes) ;; esac ], - AC_MSG_RESULT(no) + AC_MSG_RESULT($hsts) ) else AC_MSG_NOTICE([disables HSTS due to lack of SSL]) - enable_hsts="no" + hsts="no" fi -if test "x$enable_hsts" != "xyes"; then +if test "x$hsts" != "xyes"; then curl_hsts_msg="no (--enable-hsts)"; AC_DEFINE(CURL_DISABLE_HSTS, 1, [disable alt-svc]) fi @@ -4038,7 +4038,7 @@ fi if test "x$enable_altsvc" = "xyes"; then SUPPORT_FEATURES="$SUPPORT_FEATURES alt-svc" fi -if test "x$enable_hsts" = "xyes"; then +if test "x$hsts" = "xyes"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HSTS" fi |