From eceff8b3c3553d0693d8fbe8c605dae53f4e16d6 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 19 Mar 2011 14:49:03 -0500
Subject: [PATCH] [devel] Added a hint to try CPP=/bin/cpp if "cpp -E" fails in

scripts/pnglibconf.mak and in contrib/pngminim/*/makefile and to try
"STRIP=touch" if strip is missing, eg., on SunOS 5.10
---
 ANNOUNCE                          | 22 ++++++++++++++--------
 CHANGES                           |  6 ++++++
 contrib/pngminim/decoder/makefile |  6 ++++++
 contrib/pngminim/encoder/makefile |  6 ++++++
 contrib/pngminim/preader/makefile |  6 ++++++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 762e44bad..1127d765a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.2rc01 - March 19, 2011
+Libpng 1.5.2rc02 - March 19, 2011
 
 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.5.2rc01.tar.xz (LZMA-compressed, recommended)
-   1.5.2rc01.tar.gz
-   1.5.2rc01.tar.bz2
+   1.5.2rc02.tar.xz (LZMA-compressed, recommended)
+   1.5.2rc02.tar.gz
+   1.5.2rc02.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp152r01.7z  (LZMA-compressed, recommended)
-   lp152r01.zip
+   lp152r02.7z  (LZMA-compressed, recommended)
+   lp152r02.zip
 
 Other information:
 
-   1.5.2rc01-README.txt
-   1.5.2rc01-LICENSE.txt
+   1.5.2rc02-README.txt
+   1.5.2rc02-LICENSE.txt
 
 Changes since the last public release (1.5.1):
 
@@ -55,6 +55,12 @@ Version 1.5.2beta03 [March 3, 2011]
 
 Version 1.5.2rc01 [March 19, 2011]
   Define remaining attributes to blank when MSC_VER<1300.
+  ifdef out mask arrays in pngread.c when interlacing is not supported.
+
+Version 1.5.2rc02 [March 19, 2011]
+  Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak
+    and in contrib/pngminim/*/makefile and to try "STRIP=touch" if strip is
+    missing, eg., on SunOS 5.10
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 390425ee9..7cf407cfa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3271,6 +3271,12 @@ Version 1.5.2beta03 [March 3, 2011]
 
 Version 1.5.2rc01 [March 19, 2011]
   Define remaining attributes to blank when MSC_VER<1300.
+  ifdef out mask arrays in pngread.c when interlacing is not supported.
+
+Version 1.5.2rc02 [March 19, 2011]
+  Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak
+    and in contrib/pngminim/*/makefile and to try "STRIP=touch" if strip is
+    missing, eg., on SunOS 5.10
 
 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 43e45bd17..da6ccb221 100644
--- a/contrib/pngminim/decoder/makefile
+++ b/contrib/pngminim/decoder/makefile
@@ -6,9 +6,15 @@ CC=gcc
 LD=$(CC)
 STRIP=strip
 
+#if strip fails try
+# make STRIP=touch
+
 # If awk fails try
 # make AWK=nawk
 
+# If cpp fails try
+# make CPP=/lib/cpp
+
 RM=rm -f
 COPY=cp
 
diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile
index a19ae7345..0d847f7c2 100644
--- a/contrib/pngminim/encoder/makefile
+++ b/contrib/pngminim/encoder/makefile
@@ -9,6 +9,12 @@ STRIP=strip
 # If awk fails try
 # make AWK=nawk
 
+# If cpp fails try
+# make CPP=/lib/cpp
+
+# If strip fails try
+# make STRIP=touch
+
 RM=rm -f
 COPY=cp
 
diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile
index 282709efa..76e47d8fc 100644
--- a/contrib/pngminim/preader/makefile
+++ b/contrib/pngminim/preader/makefile
@@ -9,6 +9,12 @@ STRIP=strip
 # If awk fails try
 # make AWK=nawk
 
+# If cpp fails try
+# make CPP=/lib/cpp
+
+# If strip fails try
+# make STRIP=touch
+
 RM=rm -f
 COPY=cp