1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 364fe879c5e..e00254b23ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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