[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac

[Tor Lillqvist]

 config_host/config_features.h.in |   11 +++++++++++
 configure.ac                     |    1 +
 2 files changed, 12 insertions(+)

New commits:
commit 3aefa4ef8020804a7dd1c03ce870d0cdd8c757c5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Aug 10 14:37:30 2013 +0300

    Add HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
    
    Change-Id: Idb114bfa3fbb05252a5cac9eb5f303ec85080626

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3b92e87..7d045df 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -88,6 +88,17 @@
 
 #define HAVE_FEATURE_MACOSX_SANDBOX 0
 
+/* MACOSX_MACLIKE_APP_STRUCTURE - LibreOffice.app substructure style
+ *
+ * Whether the structure of the LibreOffice.app bundle is more
+ * "Mac-like" and what it has been previously, for instance with all
+ * dylibs in the "Frameworks" folder and all non-code data in a the
+ * "Resources" folder. For now coupled to HAVE_FEATURE_MACOSX_SANDBOX
+ * in configure.ac.
+ */
+
+#define HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE 0
+
 /* READONLY_INSTALLSET - whether to treat the installation as read-only
  *
  * Prevents attempts by LibreOffice to write into its installation. That means
diff --git a/configure.ac b/configure.ac
index 3ade88e..c7c9638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2870,6 +2870,7 @@ if test $_os = Darwin -a "$ENABLE_MACOSX_SANDBOX" = YES; then
     LIBO_URE_LIB_FOLDER=Frameworks
     LIBO_URE_SHARE_FOLDER=Resources/ure
     LIBO_URE_SHARE_JAVA_FOLDER=Resources/java
+    AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
 elif $_os = WINNT; then
     LIBO_BIN_FOLDER=program
     LIBO_ETC_FOLDER=program