configure.ac | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 2076ae6168a76c534262a191442448186692ea74
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Sep 15 14:44:27 2022 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:58:50 2022 +0200
Make --with-system-nss default on Linux again
Functionally revert what I did in the 'Temporarily revert "tdf#147250
configure: default to --with-system-nss on..."' commit.
Change-Id: Ic576d3969976057dd520ee03bc1cb32540078c63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140055
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index c4de07a897b9..7b855a5e89a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10479,7 +10479,14 @@ dnl
===================================================================
dnl Check for system NSS
dnl ===================================================================
if test "$enable_fuzzers" != "yes" -a "$enable_nss" = "yes"; then
- libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+ case "$_os" in
+ Linux)
+ libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >=
4.8],,,TRUE)
+ ;;
+ *)
+ libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+ ;;
+ esac
AC_DEFINE(HAVE_FEATURE_NSS)
ENABLE_NSS=TRUE
elif test $_os != iOS ; then
