cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Make autogen.sh work with automake 1.13 as well as 1.14. Do this

Browse Source 
by always removing the 1.14 'compile' script but never checking for it.
This commit is contained in:
John Bowler 2013-10-06 11:29:55 -05:00 committed by Glenn Randers-Pehrson
parent 236e105170
commit 34ac3691cb
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.6.7beta02 - October 5, 2013 Libpng 1.6.7beta02 - October 6, 2013
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -46,7 +46,7 @@ Version 1.6.7beta01 [September 30, 2013]
was never implemented. was never implemented.
Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes
Version 1.6.7beta02 [October 5, 2013] Version 1.6.7beta02 [October 6, 2013]
Made changes for compatibility with automake 1.14: Made changes for compatibility with automake 1.14:
1) Added the 'compile' program to the list of programs that must be cleaned 1) Added the 'compile' program to the list of programs that must be cleaned
in autogen.sh in autogen.sh
@ -69,6 +69,8 @@ Version 1.6.7beta02 [October 5, 2013]
useful side effect of avoiding a bogus warning generated by the latest useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to version of the Intel C compiler (it objects to
condition ? string-literal : string-literal). 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

4
CHANGES
View File

@ -4660,7 +4660,7 @@ Version 1.6.7beta01 [September 30, 2013]
was never implemented. was never implemented.
Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes
Version 1.6.7beta02 [October 5, 2013] Version 1.6.7beta02 [October 6, 2013]
Made changes for compatibility with automake 1.14: Made changes for compatibility with automake 1.14:
1) Added the 'compile' program to the list of programs that must be cleaned 1) Added the 'compile' program to the list of programs that must be cleaned
in autogen.sh in autogen.sh
@ -4683,6 +4683,8 @@ Version 1.6.7beta02 [October 5, 2013]
useful side effect of avoiding a bogus warning generated by the latest useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to version of the Intel C compiler (it objects to
condition ? string-literal : string-literal). 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

8
autogen.sh
View File

@ -74,8 +74,11 @@ done
# #
# The autotools generated files: # The autotools generated files:
libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\ libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\
config.sub configure depcomp install-sh ltmain.sh missing test-driver\ config.sub configure depcomp install-sh ltmain.sh missing test-driver"
compile" #
# 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. # These are separate because 'maintainer-clean' does not remove them.
libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\ 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. # of Makefile. These functions do the two bits of cleaning.
clean_autotools(){ clean_autotools(){
rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs
rm -rf $libpng_autotools_extra
} }
clean_configure(){ clean_configure(){