Link to glib-using libraries when checking for glib.

* configure.ac (XGSELOBJ): Include GTK_LIBS, RSVG_LIBS, etc.
when testing whether Glib is linked in.  Similarly for CFLAGS.

Fixes: debbugs:17289

diff --git a/ChangeLog b/ChangeLog
index caeaae428ad803577074218c4a482c93407b3044..8faee40812e8870e217d634c6ed9936523a7a406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Link to glib-using libraries when checking for glib (Bug#17289).
+       * configure.ac (XGSELOBJ): Include GTK_LIBS, RSVG_LIBS, etc.
+       when testing whether Glib is linked in.  Similarly for CFLAGS.
+
 2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * GNUmakefile: Speed up 'make bootstrap' in fresh checkout.

diff --git a/configure.ac b/configure.ac
index 3717abcf348d1848354a2ab8853fa6d7cea173d3..9096681d78c8126c91e8917905d9383cd04c01ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3806,11 +3806,12 @@ AC_FUNC_FORK
 
 AC_CHECK_FUNCS(snprintf)
 
-dnl Check this late.  It depends on what other libraries (lrsvg, Gtk+ etc)
-dnl Emacs uses.
+dnl Check this late, since it depends on $GTK_CFLAGS etc.
 XGSELOBJ=
 OLDCFLAGS="$CFLAGS"
 OLDLIBS="$LIBS"
+CFLAGS="$CFLAGS $GTK_CFLAGS $RSVG_CFLAGS $DBUS_CFLAGS $SETTINGS_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $RSVG_LIBS $DBUS_LIBS $SETTINGS_LIBS"
 CFLAGS="$CFLAGS $GFILENOTIFY_CFLAGS"
 LIBS="$LIBS $GFILENOTIFY_LIBS"
 AC_MSG_CHECKING([whether GLib is linked in])