[Emacs-diffs] /srv/bzr/emacs/trunk r103542: * configure.in (FREETYPE_LIBS): Actually set it to something.

[Glenn Morris]

------------------------------------------------------------
revno: 103542
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 17:42:13 -0800
message:
  * configure.in (FREETYPE_LIBS): Actually set it to something.
  
  This was needed for linking a lucid toolkit build on a recent
  Debian testing system.  Without this, it failed with:
  ftfont.o: undefined reference to symbol 'FT_New_Face'
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-03-02 05:25:09 +0000
+++ b/ChangeLog 2011-03-06 01:42:13 +0000
@@ -1,3 +1,7 @@
+2011-03-06  Glenn Morris  <address@hidden>
+
+       * configure.in (FREETYPE_LIBS): Actually set it to something.
+
 2011-03-02  Paul Eggert  <address@hidden>
 
        Work around some portability problems with symlinks.

=== modified file 'configure.in'
--- a/configure.in      2011-03-03 08:03:01 +0000
+++ b/configure.in      2011-03-06 01:42:13 +0000
@@ -2244,15 +2244,23 @@
       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
+       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
 
-    ## We used to allow building with FreeType and without Xft.
-    ## However, the ftx font backend driver is not in good shape.
-    HAVE_FREETYPE=$HAVE_XFT
-
     HAVE_LIBOTF=no
     if test "${HAVE_FREETYPE}" = "yes"; then
       AC_DEFINE(HAVE_FREETYPE, 1,