[Emacs-diffs] emacs-24 r116884: * configure.ac: Fix errors from previous checkin (GSettings check).

[Jan D.]

------------------------------------------------------------
revno: 116884
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-03-31 08:08:29 +0200
message:
  * configure.ac: Fix errors from previous checkin (GSettings check).
  Backport from trunk.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-30 23:59:19 +0000
+++ b/ChangeLog 2014-03-31 06:08:29 +0000
@@ -1,3 +1,8 @@
+2014-03-31  Jan Djärv  <address@hidden>
+
+       * configure.ac: Fix errors from previous checkin (GSettings check).
+       Backport from trunk.
+
 2014-03-30  Daniel Colascione  <address@hidden>
 
        * configure.ac: Include GFILENOTIFY objects in glib check.  (Bug#17069)

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-30 23:59:19 +0000
+++ b/configure.ac      2014-03-31 06:08:29 +0000
@@ -2432,6 +2432,10 @@
 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
+      old_CFLAGS=$CFLAGS
+      CFLAGS="$CFLAGS $GSETTINGS_CFLAGS"
+      old_LIBS=$LIBS
+      LIBS="$LIBS $GSETTINGS_LIBS"
       AC_MSG_CHECKING([whether GSettings is in gio])
       GSETTINGS_COMPILES=no
       AC_LINK_IFELSE(
@@ -2447,11 +2451,13 @@
         [GSETTINGS_COMPILES=yes])
       AC_MSG_RESULT([$GSETTINGS_COMPILES])
 
-      if test "$$GSETTINGS_COMPILES" = "yes"; then
+      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
+      CFLAGS=$old_CFLAGS
+      LIBS=$old_LIBS
    fi
 fi