[Emacs-diffs] emacs-24 r116879: * configure.ac: Add check that GSettings is in libgio. Backport from trunk.

[Jan D.]

------------------------------------------------------------
revno: 116879
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17118
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-03-30 12:44:33 +0200
message:
  * configure.ac: Add check that GSettings is in libgio. Backport from trunk.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-26 04:16:13 +0000
+++ b/ChangeLog 2014-03-30 10:44:33 +0000
@@ -1,3 +1,8 @@
+2014-03-30  Jan Djärv  <address@hidden>
+
+       * configure.ac: Add check that GSettings is in libgio (Bug#17118).
+       Backport from trunk.
+
 2014-03-26  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-05 20:35:38 +0000
+++ b/configure.ac      2014-03-30 10:44:33 +0000
@@ -2432,9 +2432,26 @@
 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