Mercurial > emacs

diff configure.in @ 112411:6178cf733e6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 21 Jan 2011 21:52:29 -0800
parents 7aa0a7abfb6d
children 16ddab338c43
line wrap: on
line diff
--- a/configure.in	Fri Jan 21 16:12:10 2011 -0800
+++ b/configure.in	Fri Jan 21 21:52:29 2011 -0800
@@ -2252,17 +2252,9 @@
        HAVE_XFT=no
     fi
 
-
-    HAVE_FREETYPE=no
     ## We used to allow building with FreeType and without Xft.
     ## However, the ftx font backend driver is not in good shape.
-    if test "${HAVE_XFT}" = "yes"; then
-      dnl As we use Xft, we anyway use freetype.
-      dnl There's no need for additional CFLAGS and LIBS.
-      HAVE_FREETYPE=yes
-      FONTCONFIG_CFLAGS=
-      FONTCONFIG_LIBS=
-    fi
+    HAVE_FREETYPE=$HAVE_XFT
 
     HAVE_LIBOTF=no
     if test "${HAVE_FREETYPE}" = "yes"; then