diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-07-26 14:06:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-07-26 14:14:06 +0300 |
| commit | 8f315d9ece9dc8bfc093e4707d761e7120092618 (patch) | |
| tree | 415e8206b20d1ff573e78ef12eddd64f83d1b1c7 | |
| parent | cca02d9e984d1937f6d8597de0267ebf22ae6916 (diff) | |
Move the (unimplemented) READONLY_INSTALLSET flag into config_features.h
Change-Id: Icce89cc2a3c8089aa248a176ab92b545c36b1091
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | config_host/config_features.h.in | 10 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index a96bfbad55aa..88f3e34438f2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -149,7 +149,6 @@ export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@ export ENABLE_PCH=@ENABLE_PCH@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ export ENABLE_RANDR=@ENABLE_RANDR@ -export ENABLE_READONLY_INSTALLSET=@ENABLE_READONLY_INSTALLSET@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 29da64cbf05b..3b92e879330e 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -88,4 +88,14 @@ #define HAVE_FEATURE_MACOSX_SANDBOX 0 +/* READONLY_INSTALLSET - whether to treat the installation as read-only + * + * Prevents attempts by LibreOffice to write into its installation. That means + * at least that no "system-wide" extensions can be added, if the location for + * them is the traditional one. Experimental work in progress, not actually implemented. + */ + +#define HAVE_FEATURE_READONLY_INSTALLSET 0 + + #endif diff --git a/configure.ac b/configure.ac index ade9c2655671..ee8a35d969ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2819,11 +2819,10 @@ if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = YES \) fi if test "$enable_readonly_installset" = yes; then AC_MSG_RESULT([yes]) - ENABLE_READONLY_INSTALLSET=YES + AC_DEFINE(HAVE_FEATURE_READONLY_INSTALLSET) else AC_MSG_RESULT([no]) fi -AC_SUBST(ENABLE_READONLY_INSTALLSET) dnl =================================================================== dnl Windows specific tests and stuff diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index c489ee49d150..9681dd25f8aa 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -261,7 +261,6 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ DISABLE_EXPORT \ DISABLE_SCRIPTING \ - ENABLE_READONLY_INSTALLSET \ ) gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) |