From 05cbe5ae28b2971cffb3750dbc209e689e97c306 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 28 Jan 2012 18:06:55 -0600 Subject: [PATCH] [libpng16] Moved automake options to AM_INIT_AUTOMAKE in configure.ac Added color-tests, silent-rules (Not yet implemented in Makefile.am) and version checking to configure.ac --- ANNOUNCE | 10 +++++++--- CHANGES | 8 ++++++-- Makefile.am | 6 ------ configure.ac | 8 +++++++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2b1a32040..59b6c8864 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta08 - January 28, 2012 +Libpng 1.6.0beta08 - January 29, 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,10 +142,14 @@ 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 28, 2012] +Version 1.6.0beta08 [January 29, 2012] Fixed Image::colormap misalignment in pngstest.c Check libtool/libtoolize version number (2.4.2) in configure.ac - Divide pngstest into separate runs for basic and transparent images. + Divide test-pngstest.sh into separate pngstest runs for basic and + transparent images. + Moved automake options to AM_INIT_AUTOMAKE in configure.ac + Added color-tests, silent-rules (Not yet implemented in Makefile.am) and + version checking to configure.ac Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 0cee2dff2..f6ccee05a 100644 --- a/CHANGES +++ b/CHANGES @@ -3893,10 +3893,14 @@ 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 28, 2012] +Version 1.6.0beta08 [January 29, 2012] Fixed Image::colormap misalignment in pngstest.c Check libtool/libtoolize version number (2.4.2) in configure.ac - Divide pngstest into separate runs for basic and transparent images. + Divide test-pngstest.sh into separate pngstest runs for basic and + transparent images. + Moved automake options to AM_INIT_AUTOMAKE in configure.ac + Added color-tests, silent-rules (Not yet implemented in Makefile.am) and + version checking to configure.ac Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/Makefile.am b/Makefile.am index 1edb40c97..a8adba395 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,12 +4,6 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ -# libpng does not follow GNU file name conventions - -# "color-tests" requires automake 1.11.1 or later. Enable it if you like, -# to get red "FAIL" and green "PASS" notations during tests. -# AUTOMAKE_OPTIONS = foreign color-tests -AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I scripts # test programs - run on make check, make distcheck diff --git a/configure.ac b/configure.ac index 8f6507b56..fd756bf5d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,13 @@ dnl Version number stuff here: AC_INIT([libpng],[1.6.0beta08],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) -AM_INIT_AUTOMAKE + +# libpng does not follow GNU file name conventions (hence 'foreign') +# color-tests requires automake 1.11 or later +# silent-rules requires automake 1.11 or later +# dist-xz requires automake 1.11 or later +# 1.11.1 fixes a security issue in 1.11 +AM_INIT_AUTOMAKE([1.11.1 foreign dist-xz dist-bzip2 color-tests silent-rules]) AM_MAINTAINER_MODE dnl configure.ac and Makefile.am expect automake 1.11.2 or a compatible later