[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

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

New commits:
commit 962eeb3e5581006112835eaed6ef9a7a9f09bd62
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 15 14:51:27 2012 +0300

    Don't build gdk-pixbuf, glib, libcroco or libgsf for iOS or Android
    
    Change-Id: I7b4ef1e505b16e0d55228e7b91226e40ba94cfd6

diff --git a/configure.in b/configure.in
index 58d86c4..3326751 100644
--- a/configure.in
+++ b/configure.in
@@ -11639,7 +11639,9 @@ else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_GDKPIXBUF=NO
-        BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
+        if test $_os != iOS -a $_os != Android; then
+            BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
+        fi
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11766,7 +11768,9 @@ else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_LIBCROCO=NO
-        BUILD_TYPE="$BUILD_TYPE LIBCROCO"
+        if test $_os != iOS -a $_os != Android; then
+            BUILD_TYPE="$BUILD_TYPE LIBCROCO"
+        fi
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11798,7 +11802,9 @@ else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_PANGO=NO
-        BUILD_TYPE="$BUILD_TYPE PANGO"
+        if test $_os != iOS -a $_os != Android; then
+            BUILD_TYPE="$BUILD_TYPE PANGO"
+        fi
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11831,7 +11837,9 @@ else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_LIBGSF=NO
-        BUILD_TYPE="$BUILD_TYPE LIBGSF"
+        if test $_os != iOS -a $_os != Android; then
+            BUILD_TYPE="$BUILD_TYPE LIBGSF"
+        fi
         AC_MSG_RESULT([no])
         ;;
     *)