[Emacs-diffs] Changes to emacs/configure,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/28 20:32:12

Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -b -r1.293 -r1.294
--- configure   22 Aug 2008 08:32:49 -0000      1.293
+++ configure   28 Aug 2008 20:32:11 -0000      1.294
@@ -12545,7 +12545,7 @@
 
 ## 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 @@
 ### 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