mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

* configure.in (FREETYPE_LIBS): Actually set it to something.

Browse Source 
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'
This commit is contained in:
Glenn Morris 2011-03-05 17:42:13 -08:00
parent 845fc5e555
commit 870d9cf691
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-03-06 Glenn Morris <rgm@gnu.org>
* configure.in (FREETYPE_LIBS): Actually set it to something.
2011-03-02 Paul Eggert <eggert@cs.ucla.edu>
Work around some portability problems with symlinks.

20
configure.in
View File

@ -2244,14 +2244,22 @@ if test "${HAVE_X11}" = "yes"; then
fi # "$HAVE_XFT" != no
fi # "x${with_xft}" != "xno"
dnl For the "Does Emacs use" message at the end.
if test "$HAVE_XFT" != "yes"; then
HAVE_XFT=no
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
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
HAVE_LIBOTF=no
if test "${HAVE_FREETYPE}" = "yes"; then