[Scummvm-cvs-logs] scummvm master -> 7be1d48f86c58944f7860924da1e22fbf4275c64

digitall dgturner at iee.org
Sun Sep 29 18:11:29 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7be1d48f86 BUILD: Fix libpng detection when compiled as shared library with zlib.


Commit: 7be1d48f86c58944f7860924da1e22fbf4275c64
    https://github.com/scummvm/scummvm/commit/7be1d48f86c58944f7860924da1e22fbf4275c64
Author: D G Turner (digitall at scummvm.org)
Date: 2013-09-29T09:13:21-07:00

Commit Message:
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.

Changed paths:
    configure



diff --git a/configure b/configure
index 9761544..5af8992 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'






More information about the Scummvm-git-logs mailing list