[Emacs-diffs] emacs-24 r116883: * configure.ac: Include GFILENOTIFY objects in glib check (backport from trunk)

[Glenn Morris]

------------------------------------------------------------
revno: 116883
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17069
author: Daniel Colascione <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-03-30 16:59:19 -0700
message:
  * configure.ac: Include GFILENOTIFY objects in glib check (backport from 
trunk)
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-30 10:44:33 +0000
+++ b/ChangeLog 2014-03-30 23:59:19 +0000
@@ -1,3 +1,7 @@
+2014-03-30  Daniel Colascione  <address@hidden>
+
+       * configure.ac: Include GFILENOTIFY objects in glib check.  (Bug#17069)
+
 2014-03-30  Jan Djärv  <address@hidden>
 
        * configure.ac: Add check that GSettings is in libgio (Bug#17118).

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-30 10:44:33 +0000
+++ b/configure.ac      2014-03-30 23:59:19 +0000
@@ -3851,6 +3851,10 @@
 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 @@
     XGSELOBJ=xgselect.o
   fi
 fi
+CFLAGS="$OLDCFLAGS"
+LIBS="$OLDLIBS"
 AC_SUBST(XGSELOBJ)
 
 dnl Adapted from Haible's version.