From 3da965ce4b8a7d9d6a83552e91480f7c8f632371 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Fri, 11 Dec 2009 07:56:25 -0600
Subject: [PATCH] [devel] Removed leftover "-DPNG_CONFIGURE_LIBPNG"

from contrib/pngminim/*/makefile
---
 ANNOUNCE                          | 5 +++--
 CHANGES                           | 3 ++-
 contrib/pngminim/decoder/makefile | 2 +-
 contrib/pngminim/encoder/makefile | 2 +-
 contrib/pngminim/preader/makefile | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index c2397561a..a94c61e14 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0beta108 - December 4, 2009
+Libpng 1.4.0beta108 - December 11, 2009
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -728,7 +728,8 @@ version 1.4.0beta107 [December 4, 2009]
     to put them in $prefix/include/libpng14 instead of in
     $prefix/include/libpng/libpng14.
 
-version 1.4.0beta108 [December 4, 2009]
+version 1.4.0beta108 [December 11, 2009]
+  Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 55c0124c9..211d2c740 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2415,7 +2415,8 @@ version 1.4.0beta107 [December 4, 2009]
     to put them in $prefix/include/libpng14 instead of in
     $prefix/include/libpng/libpng14.
 
-version 1.4.0beta108 [December 4, 2009]
+version 1.4.0beta108 [December 11, 2009]
+  Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile
index 49b2621b1..2858f9c90 100644
--- a/contrib/pngminim/decoder/makefile
+++ b/contrib/pngminim/decoder/makefile
@@ -7,7 +7,7 @@ LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
        -DdeflateParams\(a,b,c\)=Z_OK -I. -O1
 
 C=.c
diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile
index 2b5054f93..8f05e8d95 100644
--- a/contrib/pngminim/encoder/makefile
+++ b/contrib/pngminim/encoder/makefile
@@ -7,7 +7,7 @@ LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZIP -I. -O1
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
 
 C=.c
 O=.o
diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile
index d761d58a0..46dd93d00 100644
--- a/contrib/pngminim/preader/makefile
+++ b/contrib/pngminim/preader/makefile
@@ -23,7 +23,7 @@ XLIB = -L/usr/X11R6/lib -lX11
 #LIBS = $(XLIB)
 LIBS = $(XLIB) -lm                      #platforms that need libm
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
        -DdeflateParams\(a,b,c\)=Z_OK -I. $(XINC) -O1
 
 C=.c