summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2015-08-09 12:40:17 +0000
committerrubidium <rubidium@openttd.org>2015-08-09 12:40:17 +0000
commita00d2b8b3c7f5f9f6ea09c9957c30036bbde288a (patch)
treea4b10fede7623927c0d5a8a7b9a47671d51f1471
parenta6710b7ea96c8a7036ccd7a490854043819fba3b (diff)
downloadopenttd-a00d2b8b3c7f5f9f6ea09c9957c30036bbde288a.tar.xz
(svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine
-rw-r--r--config.lib16
1 files changed, 9 insertions, 7 deletions
diff --git a/config.lib b/config.lib
index d6181fcd7..e50839e77 100644
--- a/config.lib
+++ b/config.lib
@@ -2728,6 +2728,7 @@ detect_pkg_config() {
# $2 - package name ('liblzma')
# $3 - config name ('lzma_config', sets $lzma_config)
# $4 - minimum module version ('2.3')
+ # $5 - check for dedicated, 1 is "skif if dedicated"
# 0 means no, 1 is auto-detect, 2 is force
if [ "$1" = "0" ]; then
@@ -2737,6 +2738,13 @@ detect_pkg_config() {
return 0
fi
+ if [ "$5" = "1" ] && [ "$1" = "1" ] && [ "$enable_dedicated" != "0" ]; then
+ log 1 "checking $2... dedicated server, skipping"
+
+ eval "$3=\"\""
+ return 0
+ fi
+
log 2 "detecting $2"
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
@@ -2839,12 +2847,6 @@ detect_fontconfig() {
fontconfig_config=""
return 0
fi
- if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then
- log 1 "checking libfontconfig... dedicated server, skipping"
-
- fontconfig_config=""
- return 0
- fi
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
log 1 "checking libfontconfig... WIN32, skipping"
fontconfig_config=""
@@ -2857,7 +2859,7 @@ detect_fontconfig() {
return 0
fi
- detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
+ detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3" "1"
}
detect_icu() {