Imported Upstream version 0.72.4

tools/Makefile.template

@@ -15,8 +15,7 @@ BZ2_INCL   = $(CFG_BZ2_INCL)
 BZ2_LFLAGS = $(CFG_BZ2_LFLAGS)
 BZ2_LIBS   = $(CFG_BZ2_LIBS)
 
-PNG_INCL   = $(CFG_PNG_INCL)
-PNG_LFLAGS = $(CFG_PNG_LFLAGS)
+PNG_CFLAGS = $(CFG_PNG_CFLAGS)
 PNG_LIBS   = $(CFG_PNG_LIBS)
 
 SYS_OPTIONS  = $(CFG_SYS_OPTIONS)
@@ -25,8 +24,8 @@ WITH_OPTIONS = $(CFG_WITH_OPTIONS)
 EXE_SUFFIX   = $(CFG_EXE_SUFFIX)
 
 LOCATIONS = -DSRCDIR=\"$(SRCDIR)\" -DBINDIR=\"$(BINDIR)\" -DDOCDIR=\"$(DOCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
-COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(BZ2_INCL) $(PNG_INCL)
-LOPTS = $(LDFLAGS) $(BZ2_LFLAGS) $(PNG_LFLAGS)
+COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(BZ2_INCL) $(PNG_CFLAGS)
+LOPTS = $(LDFLAGS) $(BZ2_LFLAGS)
 
 LIBS = $(EFENCE_LIBS) $(BZ2_LIBS) $(PNG_LIBS) -lm
 
@@ -49,7 +48,7 @@ OFILES = $(CFG_OFILES)
 
 pngpack: $(OFILES)
 	@echo "Linking  : pngpack";
-	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
+	@if test $(CFG_SYS_OPTIONS) = -DSYS_MINGW; \
 	then $(CC) $(LOPTS) $(OFILES) $(LIBS) -lz --static -o pngpack; \
 	else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o pngpack; \
 	fi
@@ -67,7 +66,7 @@ show:
 	@echo "EFENCE_LFLAGS= " $(EFENCE_LFLAGS)
 	@echo "EFENCE_LIBS  = " $(EFENCE_LIBS)
 	@echo
-	@echo "PNG_LFLAGS   = " $(PNG_LFLAGS)
+	@echo "PNG_CFLAGS   = " $(PNG_CFLAGS)
 	@echo "PNG_LIBS     = " $(PNG_LIBS)
 	@echo
 	@echo "SYS_OPTIONS  = " $(SYS_OPTIONS)

tools/configure

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 # Load the shell functions needed for the rest of this script.
 
@@ -40,8 +40,7 @@ PRINT_MESSAGE "\nLooking for includes and libraries:"
 REQUIRE_INCLUDE bzlib.h bz2
 REQUIRE_LIBRARY bz2 BZ2_bzReadOpen bz2
 
-REQUIRE_INCLUDE png.h png
-REQUIRE_LIBRARY png png_sig_cmp png
+REQUIRE_PNG
 
 # Byte order
 

tools/memory.c

@@ -17,7 +17,7 @@
  *  or direct your browser at http://www.gnu.org.
  */
 
-#if !defined(SYS_FREEBSD) && !defined(SYS_DARWIN)   /* FreeBSD declares malloc() in stdlib.h */
+#if !defined(SYS_FREEBSD)  /* FreeBSD declares malloc() in stdlib.h */
  #include <malloc.h>
 #endif
 

tools/pngio.h

@@ -20,6 +20,7 @@
 #ifndef PNGIO_H
 #define PNGIO_H
 
+#include <zlib.h>
 #include <png.h>
 
 typedef struct