From 63adc1569186ac3e1e64416f884544af365b31d2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 31 Mar 2014 09:22:32 -0700 Subject: [PATCH] * configure.ac: Make the final "Does Emacs use Gsettings" message consistent with src/config.h. --- ChangeLog | 5 +++++ configure.ac | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25efcf1e69a..65e730fffd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-03-31 Glenn Morris + + * configure.ac: Make the final "Does Emacs use Gsettings" message + consistent with src/config.h. + 2014-03-31 Jan Djärv * configure.ac: Fix errors from previous checkin (GSettings check). diff --git a/configure.ac b/configure.ac index 9074cb2ffe6..83bbb32959b 100644 --- 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" -- 2.39.2