From: Daniel Colascione <dancol@dancol.org>
Date: Sun, 30 Mar 2014 23:59:19 +0000 (-0700)
Subject: * configure.ac: Include GFILENOTIFY objects in glib check (backport from trunk)
X-Git-Tag: emacs-24.3.90~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e86e380dc76be2e49f23c9bf7f28eda076875c7;p=emacs.git

* configure.ac: Include GFILENOTIFY objects in glib check (backport from trunk)

Fixes: debbugs:17069
---

diff --git a/ChangeLog b/ChangeLog
index e5e69669293..5f696779d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-30  Daniel Colascione  <dancol@dancol.org>
+
+	* configure.ac: Include GFILENOTIFY objects in glib check.  (Bug#17069)
+
 2014-03-30  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* configure.ac: Add check that GSettings is in libgio (Bug#17118).
diff --git a/configure.ac b/configure.ac
index 44199c1fb50..971674bb3f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3851,6 +3851,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>
@@ -3865,6 +3869,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.