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

[Tor Lillqvist]

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

New commits:
commit fed96abcb593925ab4fd39e3938632a54b37ee8b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Sep 19 19:59:18 2013 +0300

    No need to by default avoid liborcus for Android, iOS and OS X
    
    Change-Id: I0e96784a86fa1f62718264fc09f0d2b4646ecd7d

diff --git a/configure.ac b/configure.ac
index d9691c2..8844a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,7 +483,6 @@ darwin*) # Mac OS X or iOS
         _os=Darwin
     fi
     enable_systray=no
-    enable_orcus=no
     # See comment above the case "$host_os"
     LINKFLAGSSHL="-dynamiclib -single_module"
 
@@ -576,7 +575,6 @@ linux-android*)
     enable_opengl=no
     enable_lpsolve=no
     enable_report_builder=no
-    enable_orcus=no
     with_theme="tango"
     test_cups=no
     test_dbus=no
@@ -8947,7 +8945,7 @@ dnl Orcus
 dnl ===================================================================
 
 AC_MSG_CHECKING([whether to enable orcus])
-if test $_os != Darwin -a $_os != Android -a $_os != iOS -a \( -z "$enable_orcus" -o "$enable_orcus" != no \); then
+if test -z "$enable_orcus" -o "$enable_orcus" != no; then
     AC_MSG_RESULT([yes])
     ENABLE_ORCUS="TRUE"
     AC_DEFINE(ENABLE_ORCUS)