[Libreoffice-commits] .: configure.in

Eike Rathke erack at kemper.freedesktop.org
Mon Aug 6 14:50:36 PDT 2012


 configure.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0c6bd06035ee773ec792f2cb0048254957a6f7e9
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Aug 6 23:49:31 2012 +0200

    maybe I'll get this right one time ... BUILD_TYPE GLIB only if not system
    
    Change-Id: I94cea4d8ea33d89a5a2883e6434a97a2692bc505

diff --git a/configure.in b/configure.in
index 9aacac7..c9e625d 100644
--- a/configure.in
+++ b/configure.in
@@ -10967,7 +10967,6 @@ else
     esac
 fi
 AC_SUBST(SYSTEM_GLIB)
-BUILD_TYPE="$BUILD_TYPE GLIB"
 
 dnl Get system's glib flags and libs.
 dnl The i18npool LanguageTag wrapper uses it for liblangtag.
@@ -10976,6 +10975,8 @@ GLIB_CFLAGS=''
 GLIB_LIBS=''
 if test "$SYSTEM_GLIB" = YES; then
     PKG_CHECK_MODULES( GLIB, glib-2.0 )
+else
+    BUILD_TYPE="$BUILD_TYPE GLIB"
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)


More information about the Libreoffice-commits mailing list