From 46dcfee46cb241a0f8e34da679ca8b42e8ee8d46 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 13 Mar 2011 18:36:47 -0400 Subject: Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk. * configure.in (FREETYPE_LIBS): Actually set it to something. * 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). --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4b3dcc3af64..b45615d4317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-03-13 Glenn Morris + + * configure.in (FREETYPE_LIBS): Actually set it to something. + +2011-03-13 Miles Bader + + * 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 * Version 23.3 released. -- cgit v1.2.1