procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
consistent with src/config.h.
This commit is contained in:
Glenn Morris 2014-03-31 09:22:32 -07:00
parent dcb4c4d753
commit 63adc15691
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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).

7
configure.ac
View file

@ -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"