2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f7917d6bec4..627fd22a1a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+        * configure.ac: (Bug#17069) Include GFILENOTIFY objects in glib
+        check.
+
 2014-03-22  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: Do not distribute lib-src/testfile.
diff --git a/configure.ac b/configure.ac
index af4a42c211f..f726251b219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3834,6 +3834,10 @@ AC_CHECK_FUNCS(snprintf)
 dnl Check this late.  It depends on what other libraries (lrsvg, Gtk+ etc)
 dnl Emacs uses.
 XGSELOBJ=
+OLDCFLAGS="$CFLAGS"
+OLDLIBS="$LIBS"
+CFLAGS="$CFLAGS $GFILENOTIFY_CFLAGS"
+LIBS="$LIBS $GFILENOTIFY_LIBS"
 AC_MSG_CHECKING([whether GLib is linked in])
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
         [[#include <glib.h>
@@ -3848,6 +3852,8 @@ if test "${links_glib}" = "yes"; then
     XGSELOBJ=xgselect.o
   fi
 fi
+CFLAGS="$OLDCFLAGS"
+LIBS="$OLDLIBS"
 AC_SUBST(XGSELOBJ)
 
 dnl Adapted from Haible's version.