From 2123570f1b0b7d3061c4a365555c87e2cfaa4320 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 19 Apr 2014 10:45:20 -0700 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ configure.ac | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index caeaae428ad..8faee40812e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-04-19 Paul Eggert + + 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 * GNUmakefile: Speed up 'make bootstrap' in fresh checkout. diff --git a/configure.ac b/configure.ac index 3717abcf348..9096681d78c 100644 --- 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]) -- 2.39.5