procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Notice when gfilenotify depends on glib

Browse source
This commit is contained in:
Daniel Colascione 2014-03-23 02:17:29 -07:00
parent a31161883b
commit dfdce7dc1c
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

6
configure.ac
View file

@ -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.