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

Fixes: debbugs:17118

2 files changed, 25 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 04f5bed7ee2..e5e69669293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/configure.ac b/configure.ac
index e112f7926a5..44199c1fb50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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