Mercurial > emacs

diff ChangeLog @ 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 647e164c1f3e
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 21 16:12:10 2011 -0800
+++ b/ChangeLog	Fri Jan 21 21:52:29 2011 -0800
@@ -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