Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint

path.
This commit is contained in:
Daniel Stone 2006-04-01 20:58:42 +00:00
parent d1e90113fc
commit 71a6f2ef6c
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2006-04-01 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
Unconditionally run the XP_USE_FREETYPE AM_CONDITIONAL, not just in
the Xprint-only path.
(To those wondering about the date: Yes, this is me doing an Xprint
commit, but it fixes the --disable-xprint path, so.)
2006-03-31 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_unaccel.c: (ExaCheckComposite):

View File

@ -1288,7 +1288,6 @@ if test "x$XPRINT" = xyes; then
# freetype support code borrowed from lib/XFont
AC_ARG_ENABLE(freetype, [ --disable-freetype],[XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=yes])
AM_CONDITIONAL(XP_USE_FREETYPE, [test x$XP_USE_FREETYPE = xyes])
if test x$XP_USE_FREETYPE = xyes; then
AC_DEFINE(XP_USE_FREETYPE,1,[Support FreeType rasterizer in Xprint for nearly all font file formats])
AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto)
@ -1322,6 +1321,7 @@ if test "x$XPRINT" = xyes; then
AC_SUBST(FREETYPE_REQUIRES)
# end freetype support
fi
AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
dnl XWin DDX