aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2013-09-29 17:13:21 +0100
committerD G Turner2013-09-29 17:13:21 +0100
commit7be1d48f86c58944f7860924da1e22fbf4275c64 (patch)
tree29474cf4fec430a5d079a589ffa5273e7b7074aa
parent118da760683ff8d19943c68a24fa5e3c5b1c923a (diff)
downloadscummvm-rg350-7be1d48f86c58944f7860924da1e22fbf4275c64.tar.gz
scummvm-rg350-7be1d48f86c58944f7860924da1e22fbf4275c64.tar.bz2
scummvm-rg350-7be1d48f86c58944f7860924da1e22fbf4275c64.zip
BUILD: Fix libpng detection when compiled as shared library with zlib.
This was breaking AmigaOS4 builds for the porter as his libpng was built as a shared library depending on zlib. This should be safe for static builds as well.
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 9761544652..5af8992845 100755
--- a/configure
+++ b/configure
@@ -3410,10 +3410,10 @@ int main(void) {
return 0;
}
EOF
- cc_check $PNG_CFLAGS $PNG_LIBS -lpng && _png=yes
+ cc_check $PNG_CFLAGS $PNG_LIBS -lpng -lz && _png=yes
fi
if test "$_png" = yes ; then
- LIBS="$LIBS $PNG_LIBS -lpng"
+ LIBS="$LIBS $PNG_LIBS -lpng -lz"
INCLUDES="$INCLUDES $PNG_CFLAGS"
fi
define_in_config_if_yes "$_png" 'USE_PNG'