(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
This commit is contained in:
		@@ -2077,6 +2077,12 @@ detect_fontconfig() {
 | 
				
			|||||||
		fontconfig_config=""
 | 
							fontconfig_config=""
 | 
				
			||||||
		return 0
 | 
							return 0
 | 
				
			||||||
	fi
 | 
						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
 | 
						if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 | 
				
			||||||
		log 1 "checking libfontconfig... WIN32, skipping"
 | 
							log 1 "checking libfontconfig... WIN32, skipping"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user