[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100526: Backport 103542 from trunk.

[Chong Yidong]

------------------------------------------------------------
revno: 100526
author: Glenn Morris  <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-03-13 18:36:47 -0400
message:
  Backport 103542 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).
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-03-07 05:20:23 +0000
+++ b/ChangeLog 2011-03-13 22:36:47 +0000
@@ -1,3 +1,14 @@
+2011-03-13  Glenn Morris  <address@hidden>
+
+       * configure.in (FREETYPE_LIBS): Actually set it to something.
+
+2011-03-13  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-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.

=== modified file 'configure.in'
--- a/configure.in      2011-03-11 17:17:33 +0000
+++ b/configure.in      2011-03-13 22:36:47 +0000
@@ -2034,21 +2034,21 @@
       fi                          # "$HAVE_XFT" != no
     fi                            # "x${with_xft}" != "xno"
 
-    dnl For the "Does Emacs use" message at the end.
+    ## 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 For the "Does Emacs use" message at the end.
        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=
+       HAVE_FREETYPE=no
+    else
+       dnl Strict linkers fail with
+       dnl ftfont.o: undefined reference to symbol 'FT_New_Face'
+       dnl if -lfreetype is not specified.
+       dnl The following is needed to set FREETYPE_LIBS.
+       PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes,
+                        HAVE_FREETYPE=no)
+
+       test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires 
libfreetype)
     fi
 
     HAVE_LIBOTF=no