From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 2 Sep 2012 11:13:24 +0000 (+0200)
Subject: * configure.ac (HAVE_GOBJECT): Check for gobject-2.0.
X-Git-Tag: emacs-24.2.90~432
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f278d339c9aea397620179bda2c396aaae073be1;p=emacs.git

* configure.ac (HAVE_GOBJECT): Check for gobject-2.0.

Fixes: debbugs:12332
---

diff --git a/ChangeLog b/ChangeLog
index cf4506f0c77..62e64622d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.ac (HAVE_GOBJECT): Check for gobject-2.0 (Bug#12332).
+
 2012-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* configure.ac (_FORTIFY_SOURCE): Define only when optimizing.
diff --git a/configure.ac b/configure.ac
index 43686361d07..0e2154aab6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2053,6 +2053,11 @@ if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
 fi
 
 if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
+    PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= 2.0, HAVE_GOBJECT=yes, HAVE_GOBJECT=no)
+    if test "$HAVE_GOBJECT" = "yes"; then
+       SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GOBJECT_CFLAGS"
+       SETTINGS_LIBS="$SETTINGS_LIBS $GOBJECT_LIBS"
+    fi
     SAVE_CFLAGS="$CFLAGS"
     SAVE_LIBS="$LIBS"
     CFLAGS="$SETTINGS_CFLAGS $CFLAGS"