# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1295664357 -32400
# Node ID 7aa0a7abfb6d1a6887366b6eb7c153cb21060076
# Parent  c04fdfa95f79d68fd9aa07ab801e13307d01423d
configure.in: Don't zero-out FONTCONFIG_CFLAGS and FONTCONFIG_LIBS
when building with XFT (doing so is incorrect, as Emacs directly uses
fontconfig, and breaks building when using a strict linker).

diff -r c04fdfa95f79 -r 7aa0a7abfb6d ChangeLog
--- a/ChangeLog	Fri Jan 21 21:20:57 2011 -0500
+++ b/ChangeLog	Sat Jan 22 11:45:57 2011 +0900
@@ -1,3 +1,10 @@
+2011-01-22  Miles Bader  <miles@gnu.org>
+
+	* configure.in: Don't zero-out FONTCONFIG_CFLAGS and
+	FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as
+	Emacs directly uses fontconfig, and breaks building when using a
+	strict linker).
+
 2011-01-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	src/config.in: shrink slightly
diff -r c04fdfa95f79 -r 7aa0a7abfb6d configure.in
--- a/configure.in	Fri Jan 21 21:20:57 2011 -0500
+++ b/configure.in	Sat Jan 22 11:45:57 2011 +0900
@@ -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