Ensure _AS_CLEANUP is defined.

* lib/m4sugar/m4sh.m4 (_AS_CLEANUP): Give initial definition.
* tests/m4sh.at (AS@&t@_INIT cleanup): Expose the need for this.

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

diff --git a/ChangeLog b/ChangeLog
index f610c79b584cb7bb8e55e6644da954c379bb609b..f072ae4fb81d135a196d8d14216afc81e840c546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-07  Eric Blake  <ebb9@byu.net>
 
+       Ensure _AS_CLEANUP is defined.
+       * lib/m4sugar/m4sh.m4 (_AS_CLEANUP): Give initial definition.
+       * tests/m4sh.at (AS@&t@_INIT cleanup): Expose the need for this.
+
        Improve m4sh maintainability.
        * lib/m4sugar/m4sh.m4: Sort macros for sanitizing the shell; no
        code change.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index edad040884c63c9dff7162d600b2a79836766c23..b49f30282c2ad939157334f0728d5b60f5bdbe66 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -134,6 +134,13 @@ m4_define([_AS_BOURNE_COMPATIBLE],
 ])
 
 
+# _AS_CLEANUP
+# -----------
+# Expanded as the last thing before m4sugar cleanup begins.  Macros
+# may append m4sh cleanup hooks to this as appropriate.
+m4_define([_AS_CLEANUP])
+
+
 # AS_COPYRIGHT(TEXT)
 # ------------------
 # Emit TEXT, a copyright notice, as a shell comment near the top of the

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 33bcca5390ca78f11834c216639dbac71e30e2e9..1fc9852b09c50eef96192f58fcd4aadb8f9806cf 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -805,6 +805,7 @@ AT_DATA_M4SH([script.as], [[dnl
 dnl Registered before AS_INIT's cleanups
 m4_wrap([echo cleanup 1
 ])
+m4_pushdef([_AS_SHELL_FN_SPY])dnl neutralize the spy, we don't care about it
 AS_INIT
 dnl Registered after AS_INIT's cleanups, thus goes to KILL diversion
 m4_wrap([echo cleanup 2