bin/check-elf-dynamic-objects | 2 +-
configure.ac | 10 +---------
m4/libo_externals.m4 | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit c9409ff2d467f0b29f0fa0a1f16e33bdf165bc1e
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Sep 8 13:51:07 2022 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:53:31 2022 +0200
Temporarily revert "tdf#147250 configure: default to --with-system-nss
on..."
I am going to back-port some other commits that interfere with this,
and will then re-apply this as part of that.
This reverts commit 16ad0a66321530b185138af3a5b01b38c572e396.
Change-Id: I4c1f84aef7eecbb4c69e91a4221ae7daac76f5de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140048
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 712856d1104c..523a892e4259 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -88,7 +88,7 @@ programfiles=$(echo ${files} | grep -o '/program/[^/]* ' |
xargs -n 1 basename)
# of maintaining ABI stability
# allow extending the allowlist using the environment variable to be able to
work
# on the installer stuff without the need for a baseline setup
-globalallowlist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6
libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1
libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6
libxml2.so.2 libxslt.so.1 libexslt.so.0 libnspr4.so libnss3.so libnssutil3.so
libplc4.so libplds4.so libsmime3.so libssl3.so ${LO_ELFCHECK_ALLOWLIST-}"
+globalallowlist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6
libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1
libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6
libxml2.so.2 libxslt.so.1 libexslt.so.0 ${LO_ELFCHECK_ALLOWLIST-}"
x11allowlist="libX11.so.6 libX11-xcb.so.1 libXext.so.6 libSM.so.6 libICE.so.6
libXinerama.so.1 libXrender.so.1 libXrandr.so.2 libcairo.so.2"
openglallowlist="libGL.so.1"
gobjectallowlist="libgobject-2.0.so.0 libglib-2.0.so.0"
diff --git a/configure.ac b/configure.ac
index 121af3c74626..910c6f6655b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10505,15 +10505,7 @@ 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)
- with_system_nss=yes
- ;;
- *)
- with_system_nss=no
- ;;
- esac])
+ libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
AC_DEFINE(HAVE_FEATURE_NSS)
ENABLE_NSS=TRUE
elif test $_os != iOS ; then
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index 659b539dc539..f755358bb395 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -10,7 +10,7 @@ AC_DEFUN([libo_CHECK_SYSTEM_MODULE], [
AC_ARG_WITH(system-$1,
AS_HELP_STRING([--with-system-$1],
[Use $1 from operating system instead of building and bundling it.]),,
- ifelse([$6],,[with_system_$1="$with_system_libs"],[[$6]]))
+ [with_system_$1="$with_system_libs"])
AC_MSG_CHECKING([which $1 to use])
if test "$with_system_$1" = "yes"; then
AC_MSG_RESULT([external])
