diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-30 16:32:07 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-30 16:32:07 +0200 |
| commit | 2e6e11eb3a837d09ac4faa69deb1ba9ba2a98792 (patch) | |
| tree | 6c998f5ee37bf463a7a9f0dcf3ccd71742c234b4 /configure.in | |
| parent | 936d08bba7cdc8c3a28d7ad716e82a00555fccef (diff) | |
| download | emacs-2e6e11eb3a837d09ac4faa69deb1ba9ba2a98792.tar.gz | |
* configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configure infloop.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
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" |