[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2d2f00bd499d69a91eda99f31910c3998b560e86
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 18 17:33:48 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 22:52:24 2020 +0200

    tdf#129177: Turn on --enable-readonly-installset unconditionally for macOS
    
    An app bundle should never be written into. We have avoided it always
    for a sandboxed (App Store) LibreOffice, but we should avoid it in all
    cases for macOS.
    
    Change-Id: I0aad5044c006fa6f371919cd73047d1b7348b44b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94444
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 6e5e18021a3c..da0d3bad8c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1493,7 +1493,7 @@ libo_FUZZ_ARG_ENABLE(readonly-installset,
     AS_HELP_STRING([--enable-readonly-installset],
         [Prevents any attempts by LibreOffice to write into its installation. That means
          at least that no "system-wide" extensions can be added. Partly experimental work in
-         progress, probably not fully implemented (but is useful for sandboxed macOS builds).]),
+         progress, probably not fully implemented. Always enabled for macOS.]),
 ,)
 
 libo_FUZZ_ARG_ENABLE(postgresql-sdbc,
@@ -3121,8 +3121,9 @@ fi
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
-if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = TRUE \) -o \
-        "$enable_extensions" != yes; then
+if test $_os = Darwin; then
+    enable_readonly_installset=yes
+elif test "$enable_extensions" != yes; then
     enable_readonly_installset=yes
 fi
 if test "$enable_readonly_installset" = yes; then