[Libreoffice-commits] .: config_host.mk.in configure.in

[Eike Rathke]

 config_host.mk.in |    2 ++
 configure.in      |   12 ++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit d0b706ed2a418c213148fe8f3b14250a168779b1
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jun 15 13:10:12 2012 +0200

    pkg-config glib

diff --git a/config_host.mk.in b/config_host.mk.in
index 4b6e002..83ef204 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -164,6 +164,8 @@ export GIO_CFLAGS=@GIO_CFLAGS@
 export GIO_LIBS=@GIO_LIBS@
 export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_REPO_NAMES=@GIT_REPO_NAMES@
+export GLIB_CFLAGS=@GLIB_CFLAGS@
+export GLIB_LIBS=@GLIB_LIBS@
 export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
 export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
 export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
diff --git a/configure.in b/configure.in
index c496eac..8edae7c 100644
--- a/configure.in
+++ b/configure.in
@@ -10792,6 +10792,18 @@ else
 fi
 AC_SUBST(SYSTEM_GLIB)
 
+dnl Get system's glib flags and libs.
+dnl The i18npool LanguageTag wrapper uses it for liblangtag.
+
+GLIB_CFLAGS=''
+GLIB_LIBS=''
+if test "$SYSTEM_GLIB" = YES; then
+    PKG_CHECK_MODULES( GLIB, glib-2.0 )
+fi
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+
 dnl ===================================================================
 dnl Test whether to build gettext runtime (libintl) or rely on the
 dnl system version