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

[jan Iversen]

 configure.ac |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit a542dba422505942f9c3c2f6e47a394e68b396a7
Author: jan Iversen <jani at libreoffice.org>
Date:   Thu Mar 1 18:48:31 2018 +0100

    iOS, do not use LXML
    
    removed LXML from iOS build.
    
    changed false "if -z" to "if test -z"
    
    Change-Id: Icf316392ce972213da039f96a8ec35495cc2ea58

diff --git a/configure.ac b/configure.ac
index f407c743babb..e5fcd807f461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8147,13 +8147,17 @@ if test $enable_python = system; then
     PYTHON_FOR_BUILD=$PYTHON
 fi
 
-if -z "$PYTHON_FOR_BUILD"; then
+if test -z "$PYTHON_FOR_BUILD"; then
     case $build_os in
         cygwin)
             AC_MSG_WARN([No system-provided python lxml, gla11y will only report widget classes and ids])
             ;;
         *)
-            BUILD_TYPE="$BUILD_TYPE LXML"
+	    if test "$OS" != "IOS"; then
+	        if test "$enable_ios_simulator" != "yes"; then
+            	    BUILD_TYPE="$BUILD_TYPE LXML"
+	        fi
+	    fi
             ;;
     esac
 else
@@ -8166,8 +8170,12 @@ else
                 AC_MSG_RESULT([no, gla11y will only report widget classes and ids])
                 ;;
             *)
-                BUILD_TYPE="$BUILD_TYPE LXML"
-                AC_MSG_RESULT([no, using internal lxml])
+	        if test "$OS" != "IOS"; then
+	            if test "$enable_ios_simulator" != "yes"; then
+            	        BUILD_TYPE="$BUILD_TYPE LXML"
+                        AC_MSG_RESULT([no, using internal lxml])
+	            fi
+	        fi
                 ;;
         esac
     fi