[Libreoffice-commits] core.git: configure.ac
Tor Lillqvist
tml at iki.fi
Sat Mar 23 09:51:13 PDT 2013
configure.ac | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 43fe205a77f8e9f0bd36dc25dd14eaf433488621
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Mar 23 18:49:16 2013 +0200
Don't turn on DISABLE_EXPORT automatically for Android and iOS
Eventually we want to be able to save documents, too.
Change-Id: Ib971163163f78d304deaac2d87db40c8438a34e9
diff --git a/configure.ac b/configure.ac
index ebb26a8..6a31c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2103,20 +2103,8 @@ if test $_os != iOS -a $_os != Android; then
BUILD_TYPE="$BUILD_TYPE DESKTOP"
fi
-# Currently we build only viewer apps for Android (and for iOS not even that yet), so to avoid getting
-# some pathological export-related code and data linked in, we will add some judicious #ifndef
-# DISABLE_EXPORT in the code in places where the linker map shows it has a big impact. Places that
-# generate large amounts of code or data related to export only but still gets linked in. At least
-# that is the theory, let's see...
-
-if test -z "$enable_export"; then
- if test $_os != Android -a $_os != iOS; then
- enable_export=yes
- fi
-fi
-
DISABLE_EXPORT=''
-if test "$enable_export" = yes; then
+if test "$enable_export" != no; then
BUILD_TYPE="$BUILD_TYPE EXPORT"
else
DISABLE_EXPORT='TRUE'
More information about the Libreoffice-commits
mailing list