>From 8e921bf86103578b56b2910590c7f1157e96e380 Mon Sep 17 00:00:00 2001 Message-Id: From: Stefano Lattarini Date: Sun, 30 Dec 2012 10:33:23 +0100 Subject: [PATCH 1/2] obsolete: better error message if AM_CONFIG_HEADER is used In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated since 2002) has been removed in favour of AC_CONFIG_HEADERS. However, the removal was done without a proper deprecation period, and that caused packages upgrading to Automake 1.13 to fail with very unclear error messages, e.g.: configure.ac:4: warning: macro 'AM_CONFIG_HEADER' not found in library from aclocal, and: configure.ac:4: error: possibly undefined macro: AM_CONFIG_HEADER If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. from autoconf. In an attempt to mitigate this issue, we re-add an AM_CONFIG_HEADER definition that simply raises a *clear* error message when the macro is used. Report by Paolo Bonzini: * t/am-config-header-no-more.sh: New test. * t/list-of-tests.mk: Add it. * m4/obsolete-err.m4: New file, contain the new AM_CONFIG_HEADER "error-raising" definition, as well as the definition of the similarly obsolete macros 'AM_C_PROTOTYPES' and 'fp_C_PROTOTYPES', moved in from ... * m4/protos.m4: ... this file, which has thus been removed. * Makefile.am (dist_automake_ac_DATA): Adjust. * t/ansi2knr-no-more.sh: Likewise. * NEWS: Update. Signed-off-by: Stefano Lattarini --- Makefile.am | 2 +- NEWS | 10 ++++++++- m4/{protos.m4 => obsolete-err.m4} | 8 ++++++-- t/am-config-header-no-more.sh | 43 +++++++++++++++++++++++++++++++++++++++ t/ansi2knr-no-more.sh | 2 +- t/list-of-tests.mk | 1 + 6 files changed, 61 insertions(+), 5 deletions(-) rename m4/{protos.m4 => obsolete-err.m4} (62%) create mode 100755 t/am-config-header-no-more.sh diff --git a/Makefile.am b/Makefile.am index 6a4ebd4..8d8e033 100644 --- a/Makefile.am +++ b/Makefile.am @@ -283,8 +283,8 @@ dist_automake_ac_DATA = \ m4/minuso.m4 \ m4/missing.m4 \ m4/mkdirp.m4 \ + m4/obsolete-err.m4 \ m4/options.m4 \ - m4/protos.m4 \ m4/python.m4 \ m4/runlog.m4 \ m4/sanity.m4 \ diff --git a/NEWS b/NEWS index bdafaed..ce4a9c8 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -New in 1.13: +New in 1.13.1: * WARNING: Future backward-incompatibilities! @@ -51,6 +51,14 @@ New in 1.13: * Bugs fixed: + - Use of the obsolete macro AM_CONFIG_HEADER causes a clear and + helpful error message, instead of obscure ones (issue introduced + in Automake 1.13). + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* Bugs fixed: + - ylwrap renames properly header guards in generated header files (*.h), instead of leaving Y_TAB_H. diff --git a/m4/protos.m4 b/m4/obsolete-err.m4 similarity index 62% rename from m4/protos.m4 rename to m4/obsolete-err.m4 index c8c7adc..24321dd 100644 --- a/m4/protos.m4 +++ b/m4/obsolete-err.m4 @@ -1,5 +1,6 @@ # -*- Autoconf -*- -# Obsolete (and now removed) automatic de-ANSI-fiction support. +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. # # Copyright (C) 1996-2012 Free Software Foundation, Inc. # @@ -7,7 +8,10 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +AC_DEFUN([AM_CONFIG_HEADER], +[AC_FATAL(['$0': this macro is obsolete. + You should use the 'AC][_CONFIG_HEADERS' macro instead.])]) + AC_DEFUN([AM_C_PROTOTYPES], [AC_FATAL([automatic de-ANSI-fication support has been removed])]) - AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) diff --git a/t/am-config-header-no-more.sh b/t/am-config-header-no-more.sh new file mode 100755 index 0000000..997c42e --- /dev/null +++ b/t/am-config-header-no-more.sh @@ -0,0 +1,43 @@ +#! /bin/sh +# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check that any attempt to use the obsolete macro AM_CONFIG_HEADER +# elicits clear and explicit fatal errors. + +. test-init.sh + +geterr () +{ + "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; } + cat stderr >&2 + grep "^configure\.ac:4:.*'AM_CONFIG_HEADER'.*obsolete" stderr + grep "'AC_CONFIG_HEADERS'.* instead" stderr +} + +$ACLOCAL +mv aclocal.m4 aclocal.sav + +echo AM_CONFIG_HEADER >> configure.ac + +geterr $ACLOCAL +test ! -f aclocal.m4 + +cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4 + +geterr $AUTOCONF +geterr $AUTOMAKE + +: diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh index e28e651..dfb2e17 100755 --- a/t/ansi2knr-no-more.sh +++ b/t/ansi2knr-no-more.sh @@ -32,7 +32,7 @@ $ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep "^configure\\.ac:5:.*$warn_rx" stderr -cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4 +cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4 $AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep "^configure\\.ac:5:.*$warn_rx" stderr diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 5ee31d0..00162a8 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -131,6 +131,7 @@ t/amhello-cross-compile.sh \ t/amhello-binpkg.sh \ t/aminit-moreargs-deprecation.sh \ t/amassign.sh \ +t/am-config-header-no-more.sh \ t/am-macro-not-found.sh \ t/amopt.sh \ t/amopts-location.sh \ -- 1.8.1.rc3.27.g3b73c7d