[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

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

New commits:
commit b368df0c540dbf6fa9ad1eb5a1fb1e00e6424c40
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jul 5 23:10:56 2011 +0300

    Do build cairo for iOS

diff --git a/configure.in b/configure.in
index aa9bfb6..f8e8070 100755
--- a/configure.in
+++ b/configure.in
@@ -8057,19 +8057,19 @@ int main(int argc, char **argv) {
     fi
 else
     AC_MSG_RESULT([no])
-    dnl we only need cairo on windows if we
-    dnl building librsvg
-
-    dnl for iOS and Android cairo isn't
-    dnl buildable yet anyway.
-    if test "$ENABLE_LIBRSVG" != NO; then
-      case "$_os" in
-        WINNT|iOS|Android)
-          ;;
-      *)
+
+    if test $_os = Android; then
+        dnl For Android cairo isn't
+        dnl buildable yet.
+        :
+    elif test $_os = WINNT; then
+        dnl We only need cairo for Windows if we
+        dnl build librsvg
+        if test "$ENABLE_LIBRSVG" != NO; then
+            BUILD_TYPE="$BUILD_TYPE CAIRO"
+        fi
+    else
         BUILD_TYPE="$BUILD_TYPE CAIRO"
-          ;;
-      esac
     fi
 fi