* configure.ac: Make the final "Does Emacs use Gsettings" message

consistent with src/config.h.

diff --git a/ChangeLog b/ChangeLog
index 25efcf1e69a71965ebcff61a28800dfe0dd24d68..65e730fffd7f3af0b18ab3b1b39e81194b749c93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-31  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Make the final "Does Emacs use Gsettings" message
+       consistent with src/config.h.
+
 2014-03-31  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.ac: Fix errors from previous checkin (GSettings check).

diff --git a/configure.ac b/configure.ac
index 9074cb2ffe66743a412f4a792090b2e5f5aea7df..83bbb32959bf2b147d1746a9c6c27a6b591feaca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2437,7 +2437,6 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
       old_LIBS=$LIBS
       LIBS="$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.  */
@@ -2448,10 +2447,10 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
               GSettings *settings;
               GVariant *val = g_settings_get_value (settings, "");
             ]])],
-        [GSETTINGS_COMPILES=yes])
-      AC_MSG_RESULT([$GSETTINGS_COMPILES])
+        [], HAVE_GSETTINGS=no)
+      AC_MSG_RESULT([$HAVE_GSETTINGS])
 
-      if test "$GSETTINGS_COMPILES" = "yes"; then
+      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"