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

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

Browse source 
Fixes: debbugs:17069
This commit is contained in:
Daniel Colascione 2014-03-30 16:59:19 -07:00 • committed by Glenn Morris
parent 34cad8271d
commit 8e86e380dc
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

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

6
configure.ac
View file

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