Add banners to generated files.

* lib/m4sugar/m4sh.m4 (_AS_SHELL_SANITIZE): Use m4_text_box for
existing banner.
(AS_INIT): Add new banners at strategic points.
* lib/autoconf/general.m4 (AC_INIT): Alter banner location, and
make consistent with other banners.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index b9d42bf269e7f9fbb381f0281a500e479833792d..b8472aed32961181703c59e85bfd4ca931e3dc9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-21  Eric Blake  <ebb9@byu.net>
+
+       Add banners to generated files.
+       * lib/m4sugar/m4sh.m4 (_AS_SHELL_SANITIZE): Use m4_text_box for
+       existing banner.
+       (AS_INIT): Add new banners at strategic points.
+       * lib/autoconf/general.m4 (AC_INIT): Alter banner location, and
+       make consistent with other banners.
+
 2008-10-20  Paolo Bonzini  <bonzini@gnu.org>
 
        Add AC_REQUIRE_SHELL_FN and the SHELL_FN diversion.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0566dd1c0bac9f2a007ebcf95320a33fb3e5af06..32c13f6f128eb76285e3650369f896a98f1c7954 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1386,8 +1386,9 @@ _AC_INIT_CONFIG_LOG
 _AC_INIT_PREPARE
 _AC_INIT_NOTICE
 _AC_INIT_COPYRIGHT
+m4_divert_text([SHELL_FN], [
+m4_text_box([Autoconf initialization.])])
 m4_divert_pop
-m4_text_box([Autoconf initialization])
 m4_ifval([$2], , [m4_ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
 dnl
 dnl Substitute for predefined variables.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index fbce0269d8dadf3207ffd988ef737857c85b4d6e..5ed52d4922361a22d0349b0ee9d7134b7700ec22 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -400,9 +400,7 @@ test x$exitcode = x0[]dnl
 # ------------------
 # This is the prolog that is emitted by AS_INIT and AS_INIT_GENERATED.
 m4_defun([_AS_SHELL_SANITIZE],
-[## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+[m4_text_box([M4sh Initialization.])
 
 AS_BOURNE_COMPATIBLE
 
@@ -1779,10 +1777,12 @@ 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])
+m4_divert_text([M4SH-INIT-FN], [m4_text_box([M4sh Shell Functions.])])
 
 # Let's go!
 m4_divert_pop([KILL])[]dnl
-m4_divert_push([BODY])[]dnl
+m4_divert_push([BODY])
+m4_text_box([Main body of script.])
 _AS_DETECT_REQUIRED([_AS_SHELL_FN_WORK])dnl
 AS_REQUIRE([_AS_UNSET_PREPARE])dnl For backwards compatibility.
 ])