From: Eric Blake Date: Tue, 9 Oct 2007 23:14:35 +0000 (-0600) Subject: Improve header of bin/autoconf. X-Git-Tag: v2.62~213^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c63638e2b7c7d40088a42d2679d4da703eaf625;p=thirdparty%2Fautoconf.git Improve header of bin/autoconf. * lib/m4sugar/m4sh.m4 (AS_INIT): Add a 'generated from' notice. * lib/autoconf/general.m4 (_AC_INIT_NOTICE): Override new notice from M4sh. * bin/autoconf.as: Put copyright up front in generated file. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index e37f7668..6f04cea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-10-09 Eric Blake + Improve header of bin/autoconf. + * lib/m4sugar/m4sh.m4 (AS_INIT): Add a 'generated from' notice. + * lib/autoconf/general.m4 (_AC_INIT_NOTICE): Override new notice + from M4sh. + * bin/autoconf.as: Put copyright up front in generated file. + * bin/autoconf.as (exit_missing_arg): Font-lock tweak. 2007-10-09 Ralf Wildenhues diff --git a/bin/autoconf.as b/bin/autoconf.as index a979619f..b68d4ef6 100644 --- a/bin/autoconf.as +++ b/bin/autoconf.as @@ -1,4 +1,6 @@ AS_INIT[]dnl -*- shell-script -*- +m4_divert_push([HEADER-COPYRIGHT])dnl +# @configure_input@ # autoconf -- create `configure' using m4 macros # Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, @@ -17,6 +19,8 @@ AS_INIT[]dnl -*- shell-script -*- # You should have received a copy of the GNU General Public License # along with this program. If not, see . +m4_divert_pop([HEADER-COPYRIGHT])dnl back to BODY + usage=["\ Usage: $0 [OPTION] ... [TEMPLATE-FILE] diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 10df3992..490c5a91 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -320,8 +320,10 @@ m4_copy([m4_PACKAGE_VERSION], [AC_VERSION]) # _AC_INIT_NOTICE # --------------- +# Provide useful headers; override the HEADER-COMMENT created by M4sh. m4_define([_AC_INIT_NOTICE], -[m4_divert_text([HEADER-COMMENT], +[m4_divert_text([KILL], [m4_undivert([HEADER-COMMENT])])dnl +m4_divert_text([HEADER-COMMENT], [@%:@ Guess values for system-dependent variables and create Makefiles. @%:@ Generated by m4_PACKAGE_STRING[]dnl m4_ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).]) diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index e8bce401..b9677bd9 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -1651,6 +1651,8 @@ m4_pattern_forbid([^_?AS_]) # Bangshe and minimal initialization. m4_divert_text([BINSH], [@%:@! /bin/sh]) +m4_divert_text([HEADER-COMMENT], + [@%:@ Generated from __file__ by m4_PACKAGE_STRING.]) m4_divert_text([M4SH-SANITIZE], [AS_SHELL_SANITIZE]) AS_REQUIRE([_AS_SHELL_FN_SPY])