[Emacs-diffs] /srv/bzr/emacs/trunk r104810: * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configure infloop.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104810
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 16:32:07 +0200
message:
  * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made 
./configure infloop.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-30 14:00:26 +0000
+++ b/ChangeLog 2011-06-30 14:32:07 +0000
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests,
+       which made ./configure infloop.
+
 2011-06-30  Jan Djärv  <address@hidden>
 
        * configure.in (gsettings): New option and check for GSettings.

=== modified file 'configure.in'
--- a/configure.in      2011-06-30 14:00:26 +0000
+++ b/configure.in      2011-06-30 14:32:07 +0000
@@ -1986,7 +1986,7 @@
 HAVE_GSETTINGS=no
 if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
    PKG_CHECK_MODULES(GSETTINGS, glib-2.0 >= 2.26, HAVE_GSETTINGS=yes, 
HAVE_GSETTINGS=no)
-   if test "$HAVE_GSETTINGS" = 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"
@@ -1996,7 +1996,7 @@
 dnl GConf has been tested under GNU/Linux only.
 dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6.
 HAVE_GCONF=no
-if test "${HAVE_GSETTINGS}" = "no" && "${HAVE_X11}" = "yes" && test 
"${with_gconf}" = "yes"; then
+if test "${HAVE_GSETTINGS}" = "no" && test "${HAVE_X11}" = "yes" && test 
"${with_gconf}" = "yes"; then
    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no)
    if test "$HAVE_GCONF" = yes; then
       AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
@@ -2006,7 +2006,7 @@
    fi
 fi
 
-if test "$HAVE_GSETTINGS" = "yes" || "$HAVE_GCONF" = yes; then
+if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
     SAVE_CFLAGS="$CFLAGS"
     SAVE_LDFLAGS="$LDFLAGS"
     CFLAGS="$SETTINGS_CFLAGS $CFLAGS"