[Emacs-diffs] emacs-24 r116885: * configure.ac: Make the final "Does Emacs use Gsettings" message

[Glenn Morris]

------------------------------------------------------------
revno: 116885
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-03-31 09:22:32 -0700
message:
  * configure.ac: Make the final "Does Emacs use Gsettings" message
  consistent with src/config.h.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-31 06:08:29 +0000
+++ b/ChangeLog 2014-03-31 16:22:32 +0000
@@ -1,3 +1,8 @@
+2014-03-31  Glenn Morris  <address@hidden>
+
+       * configure.ac: Make the final "Does Emacs use Gsettings" message
+       consistent with src/config.h.
+
 2014-03-31  Jan Djärv  <address@hidden>
 
        * configure.ac: Fix errors from previous checkin (GSettings check).

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-31 06:08:29 +0000
+++ b/configure.ac      2014-03-31 16:22:32 +0000
@@ -2437,7 +2437,6 @@
       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 @@
               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"