diff options
| author | truebrain <truebrain@openttd.org> | 2008-10-19 21:32:29 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2008-10-19 21:32:29 +0000 |
| commit | 92d4472bcea0167309ad8189d389caac69761de5 (patch) | |
| tree | 817357f8395ab1aa952bb077a945b9fe0929bb67 /config.lib | |
| parent | fa1e746d2feda4415022e9c6e5cfdcb175a25b85 (diff) | |
| download | openttd-92d4472bcea0167309ad8189d389caac69761de5.tar.xz | |
(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 6 |
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" |