summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruebrain <truebrain@openttd.org>2008-10-19 21:32:29 +0000
committertruebrain <truebrain@openttd.org>2008-10-19 21:32:29 +0000
commit122ce41f7887831ee4613bd36690544ecb736358 (patch)
tree817357f8395ab1aa952bb077a945b9fe0929bb67
parent29ea45fc028db3b5a18036d65a26639486f2c1d5 (diff)
downloadopenttd-122ce41f7887831ee4613bd36690544ecb736358.tar.xz
(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
-rw-r--r--config.lib6
1 files changed, 6 insertions, 0 deletions
diff --git a/config.lib b/config.lib
index dbeaf0587..42ef61e68 100644
--- a/config.lib
+++ b/config.lib
@@ -2077,6 +2077,12 @@ detect_fontconfig() {
fontconfig_config=""
return 0
fi
+ if [ "$with_fontconfig" != "2" ] && [ -z "$freetype_config" ]; then
+ log 1 "checking libfontconfig... no freetype, skipping"
+
+ fontconfig_config=""
+ return 0
+ fi
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
log 1 "checking libfontconfig... WIN32, skipping"