gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)

Browse Source
This commit is contained in:
truebrain 2008-10-19 21:29:12 +00:00
parent f609a26929
commit 29ea45fc02
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
config.lib
View File

@ -610,6 +610,16 @@ check_params() {
fi fi
detect_zlib detect_zlib
if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
log 1 "WARNING: zlib was not detected or disabled"
log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean many features (like"
log 1 "WARNING: loading most savegames/scenarios, joining most servers, loading"
log 1 "WARNING: heightmaps, using PNG or using fonts, ...) will be disabled."
log 1 "WARNING: We strongly suggest you to install zlib."
sleep 5
fi
detect_png detect_png
detect_freetype detect_freetype
detect_fontconfig detect_fontconfig
@ -1950,12 +1960,21 @@ detect_png() {
return 0 return 0
fi fi
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
log 1 "configure: error: libpng depends on zlib, which couldn't be found / was disabled" if [ "$with_png" != "1" ]; then
log 1 "configure: error: please supply --with-zlib, with a valid zlib location" log 1 "checking libpng... no zlib"
log 1 "ERROR: libpng was forced, but zlib was not detected / disabled."
log 1 "ERROR: libpng depends on zlib."
exit 1 exit 1
fi fi
log 1 "checking libpng... no zlib, skipping"
png_config=""
return 0
fi
if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then
png_config="libpng-config" png_config="libpng-config"
else else
@ -2000,12 +2019,21 @@ detect_freetype() {
return 0 return 0
fi fi
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled" if [ "$with_freetype" != "1" ]; then
log 1 "configure: error: please supply --with-zlib, with a valid zlib location" log 1 "checking libfreetype... no zlib"
log 1 "ERROR: libfreetype was forced, but zlib was not detected / disabled."
log 1 "ERROR: libfreetype depends on zlib."
exit 1 exit 1
fi fi
log 1 "checking libfreetype... no zlib, skipping"
freetype_config=""
return 0
fi
if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
freetype_config="freetype-config" freetype_config="freetype-config"
else else