Mercurial Mercurial > openttd-mini / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
authortruebrain
Sun, 19 Oct 2008 21:32:29 +0000
changeset 10266 21572e285f06
parent 10265 625e98387a07
child 10267 eb318bb95dc1
(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
config.lib file | annotate | diff | comparison | revisions 
--- a/config.lib	Sun Oct 19 21:29:12 2008 +0000
+++ b/config.lib	Sun Oct 19 21:32:29 2008 +0000
@@ -2077,6 +2077,12 @@
 		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"
openttd-mini