]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
configure: use AC_MSG_WARN for TLS/experimental warning texts
authorDaniel Stenberg <daniel@haxx.se>
Thu, 13 Jun 2024 14:08:19 +0000 (16:08 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 13 Jun 2024 15:17:15 +0000 (17:17 +0200)
- no longer warns for mbedtls
- warns for each item on individual lines
- no longer shows irrelevant TLS libraries when multiple are selected
- removes ech repetition

Closes #13941

configure.ac
m4/curl-confopts.m4

index 8e23ca6fdb43bb79cc500b3980e9bf063c79f6db..d844bbdfac6c192780261fb0c8e60aabd07de1e0 100644 (file)
@@ -5044,15 +5044,15 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
   Features:         ${SUPPORT_FEATURES}
 ])
 
-non13=`echo "$TLSCHOICE" | $EGREP -i 'bearssl|secure-transport|mbedtls'`;
+non13=`echo "$TLSCHOICE" | $EGREP -io 'bearssl|secure-transport'`;
 if test -n "$non13"; then
- cat >&2 << _EOF
-  WARNING: A selected TLS library ($TLSCHOICE) does not support TLS 1.3!
-_EOF
+ for a in $non13; do
+   AC_MSG_WARN([$a is enabled for TLS but it does not support TLS 1.3])
+ done
 fi
 
 if test -n "$experimental"; then
- cat >&2 << _EOF
-  WARNING: $experimental enabled but marked EXPERIMENTAL. Use with caution!
-_EOF
+ for a in $experimental; do
+   AC_MSG_WARN([$a is enabled but marked EXPERIMENTAL. Use with caution!])
+ done
 fi
index c5a3e027bfa7a70897314c8d775df54a6933f4e2..5ee1632c60b702755acdfb7527aa90427b715d41 100644 (file)
@@ -662,7 +662,6 @@ AS_HELP_STRING([--disable-httpsrr],[Disable HTTPSRR support]),
       dnl --enable-httpsrr option used
       want_httpsrr="yes"
       curl_httpsrr_msg="enabled (--disable-httpsrr)"
-      experimental="httpsrr"
       AC_MSG_RESULT([yes])
       ;;
   esac
@@ -698,7 +697,6 @@ AS_HELP_STRING([--disable-ech],[Disable ECH support]),
       dnl --enable-ech option used
       want_ech="yes"
       curl_ech_msg="enabled (--disable-ech)"
-      experimental="ech"
       AC_MSG_RESULT([yes])
       ;;
   esac