* configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configu...

diff --git a/ChangeLog b/ChangeLog
index dccb13c668514fe68db4577b7216cea41851168d..c6eae422264666ff68b03ca6eb13e81cb0a76cba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests,
+       which made ./configure infloop.
+
 2011-06-30  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.in (gsettings): New option and check for GSettings.

diff --git a/configure.in b/configure.in
index ee091f3e2bc646ca61143f54e78be857a0d1856b..92fd6847d5343f85f7e514445c66c0bedaf49aea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1986,7 +1986,7 @@ dnl GSettings has been tested under GNU/Linux only.
 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 @@ fi
 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 @@ if test "${HAVE_GSETTINGS}" = "no" && "${HAVE_X11}" = "yes" && test "${with_gcon
    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"