LIBPNG: On android move zlib.h out of the way of version detection

This is needed, as we link agains the default -lz, which is older:
0x1270 not 0x12b0, which we add if needed for some modules

Author: mgorges

libraries/libpng/make.sh

@@ -13,7 +13,13 @@ rmifexists $SYS_PREFIX/include/png*
 package_configure $EXTRACONF --with-zlib-prefix="$SYS_PREFIX" --enable-static --disable-shared
 
 if [ ! $SYS_HOSTPLATFORM = win32 ]; then
-  package_make
+  if [ $SYS_PLATFORM = android ] && [ -f $SYS_PREFIX/include/zlib.h ] ; then
+    mv $SYS_PREFIX/include/zlib.h $SYS_PREFIX/include/zlib.h.tmp
+    package_make
+    mv $SYS_PREFIX/include/zlib.h.tmp $SYS_PREFIX/include/zlib.h
+  else
+    package_make
+  fi
 else
   # mutilate some default windows makefile - argh!
   cat scripts/makefile.msys | sed "s|CC =|CC=$SYS_CC #|;s|DESTDIR=|DESTDIR=$SYS_PREFIX #|;s|ZLIBDIR=|ZLIBDIR=$SYS_PREFIX/lib #|;s|ZLIBINC=|ZLIBINC=$SYS_PREFIX/include #|" > makefile.msys