[Emacs-diffs] /srv/bzr/emacs/trunk r102932: configure.in: Don't zero-out FONTCONFIG_CFLAGS and FONTCONFIG_LIBS

[Miles Bader]

------------------------------------------------------------
revno: 102932
committer: Miles Bader <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-22 11:45:57 +0900
message:
  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).
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-22 00:12:10 +0000
+++ b/ChangeLog 2011-01-22 02:45:57 +0000
@@ -1,3 +1,10 @@
+2011-01-22  Miles Bader  <address@hidden>
+
+       * 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  <address@hidden>
 
        src/config.in: shrink slightly

=== modified file 'configure.in'
--- a/configure.in      2011-01-22 00:12:10 +0000
+++ b/configure.in      2011-01-22 02:45:57 +0000
@@ -2252,17 +2252,9 @@
        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