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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index e37f766865bac037bb63d9507162fbac9846a33c..6f04cea136bb7cc31fad5d6be87d40ce4c8caa89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-09  Eric Blake  <ebb9@byu.net>
 
+       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  <Ralf.Wildenhues@gmx.de>

diff --git a/bin/autoconf.as b/bin/autoconf.as
index a979619ff110a6d6fd55352039120b2a68e5ea10..b68d4ef607d00c8d0bbe8a2b5281fae0cbac6ecc 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
+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 10df3992e95b895fde23471b7989696049f50bdc..490c5a91a1c3f731c9e1f3833d07b62ee8ef2be8 100644 (file)
--- 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 e8bce4016948e6eafe9dd9a0cf56e89791f4f2a8..b9677bd904c6c080aa236ec8e194a0ee32c863ce 100644 (file)
--- 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])