diff options
author | John Bowler <jbowler@acm.org> | 2013-10-06 11:29:55 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-10-06 11:29:55 -0500 |
commit | 34ac3691cb095f45b22909bbe1ebcd52f70d1232 (patch) | |
tree | f9ffb66729dc1d0590818bafbe7fa1050594657b /autogen.sh | |
parent | 236e10517025b4fb47814682306ccf7e92990509 (diff) |
[libpng16] 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.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 8 |
1 files changed, 6 insertions, 2 deletions
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(){ |