diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 8 insertions, 9 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 diff --git a/configure.in b/configure.in index bd1133319ba..161ba74f944 100644 --- a/configure.in +++ b/configure.in @@ -2252,17 +2252,9 @@ if test "${HAVE_X11}" = "yes"; then HAVE_XFT=no fi - - HAVE_FREETYPE=no ## We used to allow building with FreeType and without Xft. ## However, the ftx font backend driver is not in good shape. - if test "${HAVE_XFT}" = "yes"; then - dnl As we use Xft, we anyway use freetype. - dnl There's no need for additional CFLAGS and LIBS. - HAVE_FREETYPE=yes - FONTCONFIG_CFLAGS= - FONTCONFIG_LIBS= - fi + HAVE_FREETYPE=$HAVE_XFT HAVE_LIBOTF=no if test "${HAVE_FREETYPE}" = "yes"; then |