diff options
| author | Rodrigo Arias Mallo <rodarima@gmail.com> | 2023-12-22 20:33:03 +0100 |
|---|---|---|
| committer | Rodrigo Arias Mallo <rodarima@gmail.com> | 2023-12-30 01:37:14 +0100 |
| commit | 2d8b8c6cb2f678a18f4b09c9750211a9b2609a31 (patch) | |
| tree | e33840cb26f9a00b12f43efb19e6c9ed165ff66e | |
| parent | 04a0e1ffde9451e9cdd9ea1e5276abe9deea7b87 (diff) | |
Change --disable-ssl to --disable-tls
The --enable-ssl/--disable-ssl option will now cause an error on
configure.
Additionally add the options --disable-openssl and --disable-mbedtls to
control the TLS library search.
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b54ece70..bb9cf395 100644 --- a/configure.ac +++ b/configure.ac @@ -78,10 +78,26 @@ AC_ARG_ENABLE([xembed], [enable_xembed=$enableval], [enable_xembed=yes]) +AC_ARG_ENABLE([tls], + [AS_HELP_STRING([--disable-tls], [Disable TLS support (for HTTPS)])], + [enable_tls=$enableval], + [enable_tls=yes]) + +dnl Deprecated, if given it will cause an error AC_ARG_ENABLE([ssl], - [AS_HELP_STRING([--disable-ssl], [Disable TLS support (for HTTPS)])], + [AS_HELP_STRING([--disable-ssl], [Disable TLS support (deprecated, use --disable-tls)])], [enable_ssl=$enableval], - [enable_ssl=yes]) + [enable_ssl=]) + +AC_ARG_ENABLE([openssl], + [AS_HELP_STRING([--disable-openssl], [Disable support for OpenSSL])], + [enable_openssl=$enableval], + [enable_openssl=yes]) + +AC_ARG_ENABLE([mbedtls], + [AS_HELP_STRING([--disable-mbedtls], [Disable support for mbedTLS])], + [enable_mbedtls=$enableval], + [enable_mbedtls=yes]) AC_ARG_WITH([ca-certs-file], [AS_HELP_STRING([--with-ca-certs-file=FILE], [Specify where to find a bundle of trusted CA certificates for TLS])], @@ -91,6 +107,14 @@ AC_ARG_WITH([ca-certs-dir], [AS_HELP_STRING([--with-ca-certs-dir=DIR], [Specify where to find a directory containing trusted CA certificates for TLS])], CA_CERTS_DIR=$withval) +if test "x$enable_ssl" = "xno"; then + AC_MSG_ERROR([The flag --disable-ssl is deprecated, use --disable-tls]) +fi +dnl Also catch --enable-ssl=maybe +if test "x$enable_ssl" != "x"; then + AC_MSG_ERROR([The flag --enable-ssl is deprecated, use --enable-tls]) +fi + AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB |