[Libreoffice-commits] .: configure.in

Eike Rathke erack at kemper.freedesktop.org
Tue Aug 7 13:24:55 PDT 2012


 configure.in |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit cf190e359d2556595b1c888b9b9028a4cc75a605
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 7 22:15:54 2012 +0200

    check only iOS|Android to exclude GLIB from BUILD_TYPE
    
    Change-Id: I146731bd9e9046ff948c0af2709569dfc539063b

diff --git a/configure.in b/configure.in
index 6635473..50f3288 100644
--- a/configure.in
+++ b/configure.in
@@ -10975,8 +10975,14 @@ GLIB_CFLAGS=''
 GLIB_LIBS=''
 if test "$SYSTEM_GLIB" = YES; then
     PKG_CHECK_MODULES( GLIB, glib-2.0 )
-elif test "$enable_librsvg" = fully-internal; then
-    BUILD_TYPE="$BUILD_TYPE GLIB"
+else
+    case "$_os" in
+    iOS|Android)
+        ;;
+    *)
+        BUILD_TYPE="$BUILD_TYPE GLIB"
+        ;;
+    esac
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)


More information about the Libreoffice-commits mailing list