@@ -2345,49 +2345,49 @@ detect_library() {
exit 1
fi
eval "with_$2=0"
return 0
eval "res=\$$2"
log 2 " trying $res... found"
log 1 "checking $2... found"
}
detect_zlib() {
detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
detect_lzo2() {
detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
detect_libtimidity() {
detect_library "$with_libtimidity" "libtimidity" "" "libtimidity.a" "timidity.h"
detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
detect_png() {
# 0 means no, 1 is auto-detect, 2 is force
if [ "$with_png" = "0" ]; then
log 1 "checking libpng... disabled"
png_config=""
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."
log 1 "checking libpng... no zlib, skipping"
Status change: