Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4b3dcc3..b45615d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-03-13  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in (FREETYPE_LIBS): Actually set it to something.
+
+2011-03-13  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-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.