mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-23 18:47:57 +00:00
Code Issues Releases Activity

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

Browse Source 
Fixes: debbugs:17118
This commit is contained in:
Jan Djärv 2014-03-29 13:08:47 +01:00
parent 1730d9634a
commit b0e04df615
2 changed files with 24 additions and 3 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-29 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Add check that GSettings is in libgio (Bug#17118).
2014-03-28 Glenn Morris <rgm@gnu.org>
* configure.ac (AC_INIT): Add "GNU" in package, add bug address.

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