[Emacs-diffs] trunk r116856: Notice when gfilenotify depends on glib

[Daniel Colascione]

------------------------------------------------------------
revno: 116856
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: debug
timestamp: Sun 2014-03-23 02:17:29 -0700
message:
  Notice when gfilenotify depends on glib
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-22 22:52:47 +0000
+++ b/ChangeLog 2014-03-23 09:17:29 +0000
@@ -1,3 +1,8 @@
+2014-03-23  Daniel Colascione  <address@hidden>
+
+       * configure.ac: (Bug#17069) Include GFILENOTIFY objects in glib
+       check.
+
 2014-03-22  Glenn Morris  <address@hidden>
 
        * make-dist: Do not distribute lib-src/testfile.

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-21 10:12:53 +0000
+++ b/configure.ac      2014-03-23 09:17:29 +0000
@@ -3834,6 +3834,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>
@@ -3848,6 +3852,8 @@
     XGSELOBJ=xgselect.o
   fi
 fi
+CFLAGS="$OLDCFLAGS"
+LIBS="$OLDLIBS"
 AC_SUBST(XGSELOBJ)
 
 dnl Adapted from Haible's version.