diff --git a/ANNOUNCE b/ANNOUNCE index c338e80cc..01cbdceef 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -51,11 +51,13 @@ Version 1.5.18beta03 [December 29, 2013] Merged pngvalid and pngtest from libpng-1.5; made compressed chunks after IDAT work with the progressive read code (this is a minor and somewhat ugly fix-up; the proper fix is in 1.6). - The 'make all-am' command no longer builds $(check_PROGRAMS), leading - to a lack of checks on cross-builds such as ARM. Makefile.am also - requires correct dependencies for the check programs on pnglibconf.h - otherwise parallel builds on fast machines can sometimes pick up the - system pnglibconf.h. + The 'make all-am' command no longer builds $(check_PROGRAMS), leading + to a lack of checks on cross-builds such as ARM. Makefile.am also + requires correct dependencies for the check programs on pnglibconf.h + otherwise parallel builds on fast machines can sometimes pick up the + system pnglibconf.h. + Rebuilt configure scripts with automake 1.14.1 and autoconf-2.69. + Require automake-1.13 and enable automake "subdirs" feature in autoconf.ac. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -64,3 +66,4 @@ to subscribe) or to glennrp at users.sourceforge.net Glenn R-P +#endif diff --git a/CHANGES b/CHANGES index 8b1a53466..e0a9e3b43 100644 --- a/CHANGES +++ b/CHANGES @@ -4175,11 +4175,13 @@ Version 1.5.18beta03 [December 29, 2013] Merged pngvalid and pngtest from libpng-1.5; made compressed chunks after IDAT work with the progressive read code (this is a minor and somewhat ugly fix-up; the proper fix is in 1.6). - The 'make all-am' command no longer builds $(check_PROGRAMS), leading - to a lack of checks on cross-builds such as ARM. Makefile.am also - requires correct dependencies for the check programs on pnglibconf.h - otherwise parallel builds on fast machines can sometimes pick up the - system pnglibconf.h. + The 'make all-am' command no longer builds $(check_PROGRAMS), leading + to a lack of checks on cross-builds such as ARM. Makefile.am also + requires correct dependencies for the check programs on pnglibconf.h + otherwise parallel builds on fast machines can sometimes pick up the + system pnglibconf.h. + Rebuilt configure scripts with automake 1.14.1 and autoconf-2.69. + Require automake-1.13 and enable automake "subdirs" feature in autoconf.ac Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/configure.ac b/configure.ac index 09393a0c0..e9e0011f0 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PREREQ(2.59) dnl Version number stuff here: AC_INIT([libpng], [1.5.18beta03], [png-mng-implement@lists.sourceforge.net]) -AM_INIT_AUTOMAKE([serial-tests]) +AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE