From 72c257730275631faf73228e01c67600814f1742 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Sun, 6 Oct 2013 09:02:09 -0500
Subject: [PATCH] [libpng17] Make autogen.sh work with automake 1.13 as well as
 1.14. Do this

by always removing the 1.14 'compile' script but never checking for it.
---
 ANNOUNCE   | 2 ++
 CHANGES    | 2 ++
 autogen.sh | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index a65865d54..6572e0d3c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -395,6 +395,8 @@ Version 1.7.0beta20 [October 6, 2013]
     useful side effect of avoiding a bogus warning generated by the latest
     version of the Intel C compiler (it objects to
     condition ? string-literal : string-literal).
+  Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always
+    removing the 1.14 'compile' script but never checking for it.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 181e443ff..b7a3c3abe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4684,6 +4684,8 @@ Version 1.7.0beta20 [October 6, 2013]
     useful side effect of avoiding a bogus warning generated by the latest
     version of the Intel C compiler (it objects to
     condition ? string-literal : string-literal).
+  Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always
+    removing the 1.14 'compile' script but never checking for it.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/autogen.sh b/autogen.sh
index 6d674d90f..ccbfad68a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -74,8 +74,11 @@ done
 #
 # The autotools generated files:
 libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\
-   config.sub configure depcomp install-sh ltmain.sh missing test-driver\
-   compile"
+   config.sub configure depcomp install-sh ltmain.sh missing test-driver"
+#
+# Files generated by versions of configue >2.68 or automake >1.13 (i.e. later
+# versions than those reqiured by configure.ac):
+libpng_autotools_extra="compile"
 #
 # These are separate because 'maintainer-clean' does not remove them.
 libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\
@@ -95,6 +98,7 @@ libpng_configure_dirs=".deps"
 # of Makefile.  These functions do the two bits of cleaning.
 clean_autotools(){
    rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs
+   rm -rf $libpng_autotools_extra
 }
 
 clean_configure(){