]> code.delx.au - gnu-emacs/blobdiff - configure
Move comment for last change to right place.
[gnu-emacs] / configure
index 438f4751cbf47a595ef6f299bbbd39c212a0a5c0..dd3a49e69ed7349015a0d8981cb7fd20c5eabe6d 100755 (executable)
--- 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