[Libreoffice-commits] core.git: configure.ac
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 29 15:14:07 UTC 2020
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 0c2653bd2e5470abf25a927e7e0fa75f1110ee7f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jul 17 22:51:39 2020 +0200
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed Jul 29 17:13:27 2020 +0200
configure: fix TLS result output
Change-Id: I488e287667a02bf9212b024420bb462deeeb052d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99685
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/configure.ac b/configure.ac
index f651056fc11c..44f89e12f770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9718,6 +9718,7 @@ if test -n "$with_tls"; then
openssl)
AC_DEFINE(USE_TLS_OPENSSL)
TLS=OPENSSL
+ AC_MSG_RESULT([$TLS])
if test "$enable_openssl" != "yes"; then
AC_MSG_ERROR(["Disabling OpenSSL was requested, but the requested TLS to use is actually OpenSSL."])
@@ -9730,11 +9731,14 @@ if test -n "$with_tls"; then
nss)
AC_DEFINE(USE_TLS_NSS)
TLS=NSS
+ AC_MSG_RESULT([$TLS])
;;
no)
+ AC_MSG_RESULT([none])
AC_MSG_WARN([Skipping TLS/SSL])
;;
*)
+ AC_MSG_RESULT([])
AC_MSG_ERROR([unsupported implementation $with_tls. Supported are:
openssl - OpenSSL
nss - Mozilla's Network Security Services (NSS)
@@ -9745,8 +9749,8 @@ else
# default to using NSS, it results in smaller oox lib
AC_DEFINE(USE_TLS_NSS)
TLS=NSS
+ AC_MSG_RESULT([$TLS])
fi
-AC_MSG_RESULT([$TLS])
AC_SUBST(TLS)
dnl ===================================================================
More information about the Libreoffice-commits
mailing list