[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit bae852548bb6559ae16402400ff4c63c225008f7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon May 14 11:44:12 2012 +0300

    No CUPS for Android or iOS
    
    Change-Id: I34b65232b11111fef6473577decc0849d3443fce

diff --git a/configure.in b/configure.in
index 3659e5c..5038c03 100644
--- a/configure.in
+++ b/configure.in
@@ -3633,10 +3633,18 @@ dnl ===================================================================
 if test "$enable_cups" = "no"; then
     test_cups=no
     ENABLE_CUPS="NO"
+elif test "$enable_cups" = "yes"; then
+    if test $_os = iOS -o $_os = Android; then
+        AC_MSG_ERROR([CUPS makes no sense for $_os])
+    fi
+    ENABLE_CUPS="YES"
+elif test $_os = iOS -o $_os = Android; then
+    ENABLE_CUPS=NO
 else
     ENABLE_CUPS="YES"
 fi
 AC_SUBST(ENABLE_CUPS)
+
 if test "$test_cups" = "yes"; then
     AC_MSG_CHECKING([whether cups support is present])
     AC_CHECK_LIB([cups], [cupsPrintFiles], [:])