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

* configure.ac: Add check that GSettings is in libgio. Backport from trunk.

Browse source 
Fixes: debbugs:17118
This commit is contained in:
Jan Djärv 2014-03-30 12:44:33 +02:00
parent 8778eb5efa
commit 4e6c9f7b2e
2 changed files with 25 additions and 3 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-30 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Add check that GSettings is in libgio (Bug#17118).
Backport from trunk.
2014-03-26 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:

23
configure.ac
View file

@ -2432,9 +2432,26 @@ HAVE_GSETTINGS=no
if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
if test "$HAVE_GSETTINGS" = "yes"; then
AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
SETTINGS_LIBS="$GSETTINGS_LIBS"
AC_MSG_CHECKING([whether GSettings is in gio])
GSETTINGS_COMPILES=no
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[/* Check that gsettings really is present. */
#include <glib-object.h>
#include <gio/gio.h>
]],
[[
GSettings *settings;
GVariant *val = g_settings_get_value (settings, "");
]])],
[GSETTINGS_COMPILES=yes])
AC_MSG_RESULT([$GSETTINGS_COMPILES])
if test "$$GSETTINGS_COMPILES" = "yes"; then
AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
SETTINGS_LIBS="$GSETTINGS_LIBS"
fi
fi
fi