This is a cosmetic patch, but it is helping me to review Paolo's series by
adding well-defined search strings into the output files.
From: Eric Blake <[EMAIL PROTECTED]>
Date: Tue, 21 Oct 2008 08:00:57 -0600
Subject: [PATCH] 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 <[EMAIL PROTECTED]>
---
ChangeLog | 9 +++++++++
lib/autoconf/general.m4 | 3 ++-
lib/m4sugar/m4sh.m4 | 8 ++++----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b9d42bf..b8472ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-21 Eric Blake <[EMAIL PROTECTED]>
+
+ 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 <[EMAIL PROTECTED]>
Add AC_REQUIRE_SHELL_FN and the SHELL_FN diversion.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0566dd1..32c13f6 100644
--- 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 fbce026..5ed52d4 100644
--- 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], [EMAIL PROTECTED]:@! /bin/sh])
m4_divert_text([HEADER-COMMENT],
[EMAIL PROTECTED]:@ 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.
])
--
1.6.0.2
