[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Thu, 28 Aug 2008 20:31:28 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/08/28 20:31:28
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -b -r1.563 -r1.564
--- configure.in 24 Aug 2008 17:46:17 -0000 1.563
+++ configure.in 28 Aug 2008 20:31:27 -0000 1.564
@@ -1808,7 +1808,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
@@ -1848,7 +1848,7 @@
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
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/05
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Adrian Robert, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Adrian Robert, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/08/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/08/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/21
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/08/24
- [Emacs-diffs] Changes to emacs/configure.in,v,
Chong Yidong <=