]> git.eshelyaron.com Git - emacs.git/commit
Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk.
authorGlenn Morris <rgm@gnu.org>
Sun, 13 Mar 2011 22:36:47 +0000 (18:36 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 13 Mar 2011 22:36:47 +0000 (18:36 -0400)
commit46dcfee46cb241a0f8e34da679ca8b42e8ee8d46
treefa7d3b5e82b953ee505cec1614c6d7057138f79d
parentad22b7f7c16aa6c26df6ec1e1c192dde2e1b0cce
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
configure.in