From 92d4472bcea0167309ad8189d389caac69761de5 Mon Sep 17 00:00:00 2001 From: truebrain Date: Sun, 19 Oct 2008 21:32:29 +0000 Subject: (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium) --- config.lib | 6 ++++++ 1 file changed, 6 insertions(+) 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" -- cgit v1.2.3-54-g00ecf