summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2008-07-01 09:04:25 +0000
committerLuotao Fu <l.fu@pengutronix.de>2008-07-01 09:04:25 +0000
commitdf3ca8d406acf25bec71b5cc77fc872659a3fe96 (patch)
treed06caeefb4bed6297412184ac99db919c001aef1
parentd1d01ff18ff9ca1038c05a5b3e4054ab556a5123 (diff)
downloadptxdist-df3ca8d406acf25bec71b5cc77fc872659a3fe96.tar.gz
ptxdist-df3ca8d406acf25bec71b5cc77fc872659a3fe96.tar.xz
fixed lib font dependency of freetype
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8558 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r--rules/xorg-lib-Xfont.in1
-rw-r--r--rules/xorg-lib-Xfont.make2
2 files changed, 2 insertions, 1 deletions
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
index b57593c2c..22ead0479 100644
--- a/rules/xorg-lib-Xfont.in
+++ b/rules/xorg-lib-Xfont.in
@@ -20,6 +20,7 @@ menuconfig XORG_LIB_XFONT
config XORG_LIB_XFONT_FREETYPE
depends on XORG_LIB_XFONT
+ select FREETYPE
bool
prompt "Use freetype as rendering library"
help
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index 8d461af65..7f35d087b 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -72,7 +72,7 @@ XORG_LIB_XFONT_AUTOCONF := \
# Use the global switch here to support freetype when
# its present in the system
#
-ifdef PTXCONF_FREETYPE
+ifdef PTXCONF_XORG_LIB_XFONT_FREETYPE
XORG_LIB_XFONT_AUTOCONF += --enable-freetype
else
XORG_LIB_XFONT_AUTOCONF += --disable-freetype