diff options
| author | rubidium <rubidium@openttd.org> | 2015-08-09 12:39:26 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2015-08-09 12:39:26 +0000 |
| commit | a6710b7ea96c8a7036ccd7a490854043819fba3b (patch) | |
| tree | b997250feefffae37e439ebf5b69b15166b97f47 | |
| parent | 8585cdc6c6878f78032e03adcf9dc1296fb8e04a (diff) | |
| download | openttd-a6710b7ea96c8a7036ccd7a490854043819fba3b.tar.xz | |
(svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib
| -rw-r--r-- | config.lib | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/config.lib b/config.lib index 67e870428..d6181fcd7 100644 --- a/config.lib +++ b/config.lib @@ -2784,29 +2784,6 @@ detect_xdg_basedir() { } detect_png() { - # 0 means no, 1 is auto-detect, 2 is force - if [ "$with_png" = "0" ]; then - log 1 "checking libpng... disabled" - - png_config="" - return 0 - fi - - if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then - if [ "$with_png" != "1" ]; then - 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 - fi - - log 1 "checking libpng... no zlib, skipping" - - png_config="" - return 0 - fi - detect_pkg_config "$with_png" "libpng" "png_config" "1.2" } @@ -2825,21 +2802,6 @@ detect_freetype() { return 0 fi - if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then - if [ "$with_freetype" != "1" ]; then - 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 - fi - - log 1 "checking libfreetype... no zlib, skipping" - - freetype_config="" - return 0 - fi - if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then freetype_config="freetype-config" else @@ -2883,13 +2845,6 @@ 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" fontconfig_config="" |