From 31675415707c87656b606910697b6f6792178d2a Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Tue, 31 Jan 2012 21:01:49 -0600
Subject: [PATCH] [libpng16] Fixed 'prefix' builds on clean systems. The
 generation of pngprefix.h

should not require itself.
---
 ANNOUNCE              | 7 +++++--
 CHANGES               | 4 +++-
 pngpriv.h             | 2 +-
 scripts/intprefix.dfn | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 1aad9326b..eb4d988fe 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta08 - January 31, 2012
+Libpng 1.6.0beta08 - February 1, 2012
 
 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.
@@ -142,7 +142,7 @@ Version 1.6.0beta07 [January 28, 2012]
     and renamed three whose names were inconsistent with those in
     pngsuite/README.txt.
 
-Version 1.6.0beta08 [January 31, 2012]
+Version 1.6.0beta08 [February 1, 2012]
   Fixed Image::colormap misalignment in pngstest.c
   Check libtool/libtoolize version number (2.4.2) in configure.ac
   Divide test-pngstest.sh into separate pngstest runs for basic and
@@ -159,6 +159,9 @@ Version 1.6.0beta08 [January 31, 2012]
     can't be sure until it is gone.
   Added symbol prefixing that allows all the libpng external symbols
     to be prefixed (suggested by Reuben Hawkins).
+  Updated "ftbb*.png" list in the owatcom and vstudio projects.
+  Fixed 'prefix' builds on clean systems. The generation of pngprefix.h
+    should not require itself.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index ee8a81e4b..02cfd5afb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3893,7 +3893,7 @@ Version 1.6.0beta07 [January 28, 2012]
     and renamed three whose names were inconsistent with those in
     pngsuite/README.txt.
 
-Version 1.6.0beta08 [%DATE%]
+Version 1.6.0beta08 [February 1, 2012]
   Fixed Image::colormap misalignment in pngstest.c
   Check libtool/libtoolize version number (2.4.2) in configure.ac
   Divide test-pngstest.sh into separate pngstest runs for basic and
@@ -3911,6 +3911,8 @@ Version 1.6.0beta08 [%DATE%]
   Added symbol prefixing that allows all the libpng external symbols
     to be prefixed (suggested by Reuben Hawkins).
   Updated "ftbb*.png" list in the owatcom and vstudio projects.
+  Fixed 'prefix' builds on clean systems. The generation of pngprefix.h
+    should not require itself.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpriv.h b/pngpriv.h
index 16661ad58..44fcffea4 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -139,7 +139,7 @@
 #include "png.h"
 #include "pnginfo.h"
 #include "pngstruct.h"
-#ifdef PNG_PREFIX
+#if defined PNG_PREFIX && !defined PNGPREFIX_H
 #  include "pngprefix.h"
 #endif
 
diff --git a/scripts/intprefix.dfn b/scripts/intprefix.dfn
index 346a6fd69..d48d54060 100644
--- a/scripts/intprefix.dfn
+++ b/scripts/intprefix.dfn
@@ -15,4 +15,5 @@
 #define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\
 	PNG_DEFN_MAGIC-name-PNG_DEFN_END
 
+#define PNGPREFIX_H /* self generation */
 #include "../pngpriv.h"