[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit ac8d01ac267bd19592b34f61641fb1afd6d662f7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:08:40 2011 +0300

    No cairo and librsvg for Android
    
    Cairo has no font backend suitable for Android anyway. So no use
    building librsvg or the other 3rd-party libs that just librsvg needs
    then either.

diff --git a/configure.in b/configure.in
index 4d9aeef..04fd7c9 100755
--- a/configure.in
+++ b/configure.in
@@ -6472,8 +6472,7 @@ dnl ===================================================================
 dnl Test whether to build cairo or rely on the system version
 dnl ===================================================================
 
-dnl Now with librsvg we always need cairo (?), so hardcode ENABLE_CAIRO to TRUE
-dnl Eventually should bin conditionals on ENABLE_CAIRO.
+dnl ENABLE_CAIRO will be set to empty later when necessary
 ENABLE_CAIRO="TRUE"
 
 BUILD_PIXMAN=""
@@ -7922,11 +7921,14 @@ no|disable)
 
 ""|yes|auto)
    if test $build_os = cygwin -o \
-           $_os = Darwin -o $_os = iOS; then
+           $_os = Darwin; then
       dnl When building on/for these OSes always use the internal one,
       dnl if at all. Add more OSes above as needed.
       AC_MSG_RESULT([internal])
       enable_librsvg=internal
+   elif test  $_os = iOS -o $_os = Android; then
+      AC_MSG_RESULT([none])
+      enable_librsvg=no
    else
       if test "$with_system_libs" = yes; then
          AC_MSG_RESULT([system])
@@ -7980,6 +7982,7 @@ internal)
 no)
    ENABLE_LIBRSVG=NO
    SYSTEM_LIBRSVG=NO
+   ENABLE_CAIRO=
    ;;
 
 *)
@@ -8007,7 +8010,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_GDKPIXBUF=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8034,7 +8037,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_GLIB=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8058,7 +8061,7 @@ if test "$with_system_gettext" = yes -o \( "$with_system_libs" = yes -a "$with_s
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_GETTEXT=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8085,7 +8088,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_LIBCROCO=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8112,7 +8115,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_PANGO=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8139,7 +8142,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_LIBGSF=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8166,7 +8169,7 @@ if test "$with_system_libpng" = yes -o \( "$with_system_libs" = yes -a "$with_sy
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_LIBPNG=NO
             AC_MSG_RESULT([no])
             ;;
@@ -8192,7 +8195,7 @@ if test "$SYSTEM_JPEG" == "YES"; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS)
+        WINNT|Darwin|iOS|Android)
             SYSTEM_LIBJPEG=NO
             AC_MSG_RESULT([no])
             ;;