From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 28 Aug 2008 20:32:11 +0000 (+0000)
Subject: Regenerate.
X-Git-Tag: emacs-pretest-23.0.90~3198
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=392b3c3ab604eabb611bacd8b3ccdc665fc80cf7;p=emacs.git

Regenerate.
---

diff --git a/configure b/configure
index 438f4751cbf..dd3a49e69ed 100755
--- a/configure
+++ b/configure
@@ -12545,7 +12545,7 @@ fi
 
 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
 HAVE_XFT=maybe
-if test "x${with_freetype}" = "xno"; then
+if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
   with_xft="no";
 fi
 if test "x${with_xft}" != "xno"; then
@@ -12871,7 +12871,7 @@ HAVE_FREETYPE=no
 ### Use -lfreetype if available, unless `--with-freetype=no'.
 if test "${HAVE_XFT}" = "yes"; then
       HAVE_FREETYPE=yes
-elif test "x${with_freetype}" != "xno"; then
+elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
 
 
   succeeded=no