From 71a6f2ef6c1138c5c6918a54dfb856183f4f242c Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 1 Apr 2006 20:58:42 +0000 Subject: [PATCH] Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint path. --- ChangeLog | 8 ++++++++ configure.ac | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4cd29c0ce..90b090e28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-01 Daniel Stone + + * 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 * exa/exa_unaccel.c: (ExaCheckComposite): diff --git a/configure.ac b/configure.ac index ba35a70bf..2fe269172 100644 --- a/configure.ac +++ b/configure.ac @@ -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