[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109858: * configure.ac (HAVE_GOBJECT
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109858: * configure.ac (HAVE_GOBJECT): Check for gobject-2.0. |
Date: |
Sun, 02 Sep 2012 13:13:24 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109858
fixes bug: http://debbugs.gnu.org/12332
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-02 13:13:24 +0200
message:
* configure.ac (HAVE_GOBJECT): Check for gobject-2.0.
modified:
ChangeLog
configure.ac
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-01 18:54:38 +0000
+++ b/ChangeLog 2012-09-02 11:13:24 +0000
@@ -1,3 +1,7 @@
+2012-09-02 Jan Djärv <address@hidden>
+
+ * configure.ac (HAVE_GOBJECT): Check for gobject-2.0 (Bug#12332).
+
2012-09-01 Paul Eggert <address@hidden>
* configure.ac (_FORTIFY_SOURCE): Define only when optimizing.
=== modified file 'configure.ac'
--- a/configure.ac 2012-09-01 18:54:38 +0000
+++ b/configure.ac 2012-09-02 11:13:24 +0000
@@ -2053,6 +2053,11 @@
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"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109858: * configure.ac (HAVE_GOBJECT): Check for gobject-2.0.,
Jan D. <=