From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 28 Aug 2008 20:31:27 +0000 (+0000)
Subject: Disable XFT and Freetype when without X.
X-Git-Tag: emacs-pretest-23.0.90~3200
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f3c27dd12cba2f3ab025444cf0ea474e3babae7;p=emacs.git

Disable XFT and Freetype when without X.
---

diff --git a/configure.in b/configure.in
index 16ec618af56..b1fccfde9df 100644
--- a/configure.in
+++ b/configure.in
@@ -1808,7 +1808,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
@@ -1848,7 +1848,7 @@ if test "${HAVE_XFT}" = "yes"; then
   dnl As we use Xft, we anyway use freetype.
   dnl In this case, there's no need of additional CFLAGS and LIBS.
   HAVE_FREETYPE=yes
-elif test "x${with_freetype}" != "xno"; then
+elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
 
   PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
   if test "${HAVE_FREETYPE}" = "yes"; then