diff options
Diffstat (limited to 'm4/curl-confopts.m4')
| -rw-r--r-- | m4/curl-confopts.m4 | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 index af15a85d9..5f877133a 100644 --- a/m4/curl-confopts.m4 +++ b/m4/curl-confopts.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -107,7 +107,7 @@ AC_HELP_STRING([--disable-curldebug],[Disable curl debug memory tracking]), ;; default) dnl configure's curldebug option not specified. Initially we will - dnl handle this as a a request to use the same setting as option + dnl handle this as a request to use the same setting as option dnl --enable-debug. IOW, initially, for debug-enabled builds dnl this will be handled as a request to enable curldebug if dnl possible, and for debug-disabled builds this will be handled @@ -198,7 +198,7 @@ AC_HELP_STRING([--disable-optimize],[Disable compiler optimizations]), ;; default) dnl configure's optimize option not specified. Initially we will - dnl handle this as a a request contrary to configure's setting + dnl handle this as a request contrary to configure's setting dnl for --enable-debug. IOW, initially, for debug-enabled builds dnl this will be handled as a request to disable optimizations if dnl possible, and for debug-disabled builds this will be handled @@ -649,37 +649,37 @@ AC_DEFUN([CURL_CHECK_NTLM_WB], [ fi ]) -dnl CURL_CHECK_OPTION_ESNI +dnl CURL_CHECK_OPTION_ECH dnl ----------------------------------------------------- dnl Verify whether configure has been invoked with option -dnl --enable-esni or --disable-esni, and set -dnl shell variable want_esni as appropriate. - -AC_DEFUN([CURL_CHECK_OPTION_ESNI], [ - AC_MSG_CHECKING([whether to enable ESNI support]) - OPT_ESNI="default" - AC_ARG_ENABLE(esni, -AC_HELP_STRING([--enable-esni],[Enable ESNI support]) -AC_HELP_STRING([--disable-esni],[Disable ESNI support]), - OPT_ESNI=$enableval) - case "$OPT_ESNI" in +dnl --enable-ech or --disable-ech, and set +dnl shell variable want_ech as appropriate. + +AC_DEFUN([CURL_CHECK_OPTION_ECH], [ + AC_MSG_CHECKING([whether to enable ECH support]) + OPT_ECH="default" + AC_ARG_ENABLE(ech, +AC_HELP_STRING([--enable-ech],[Enable ECH support]) +AC_HELP_STRING([--disable-ech],[Disable ECH support]), + OPT_ECH=$enableval) + case "$OPT_ECH" in no) - dnl --disable-esni option used - want_esni="no" - curl_esni_msg="no (--enable-esni)" + dnl --disable-ech option used + want_ech="no" + curl_ech_msg="no (--enable-ech)" AC_MSG_RESULT([no]) ;; default) dnl configure option not specified - want_esni="no" - curl_esni_msg="no (--enable-esni)" + want_ech="no" + curl_ech_msg="no (--enable-ech)" AC_MSG_RESULT([no]) ;; *) - dnl --enable-esni option used - want_esni="yes" - curl_esni_msg="enabled (--disable-esni)" - experimental="esni" + dnl --enable-ech option used + want_ech="yes" + curl_ech_msg="enabled (--disable-ech)" + experimental="ech" AC_MSG_RESULT([yes]) ;; esac |