From 2e6e11eb3a837d09ac4faa69deb1ba9ba2a98792 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 30 Jun 2011 16:32:07 +0200 Subject: [PATCH] * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configure infloop. --- ChangeLog | 5 +++++ configure.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dccb13c6685..c6eae422264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-30 Lars Magne Ingebrigtsen + + * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, + which made ./configure infloop. + 2011-06-30 Jan Djärv * configure.in (gsettings): New option and check for GSettings. diff --git a/configure.in b/configure.in index ee091f3e2bc..92fd6847d53 100644 --- 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" -- 2.39.2