[PATCH] m4sh: fix today's AS_BOX regression

[Eric Blake]

* lib/m4sugar/m4sh.m4 (_AS_BOX_LITERAL): Fix underquotation.
Reported by Stefano Lattarini.

Signed-off-by: Eric Blake <address@hidden>
---

-## $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ##
+## $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ##[]

AS_BOX was not carefully quoting it's output, so that the ## from
AS_BOX were treating the rest of the line as comment characters.
Until today's change that made AS_ECHO put an extra [] at the
end of the expansion, we weren't noticing the difference.  This
patch adds the quoting needed to keep the # neutral, so the [] can
be eaten by m4.

 ChangeLog           |    4 ++++
 lib/m4sugar/m4sh.m4 |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9911ba..7710302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-16  Eric Blake  <address@hidden>

+       m4sh: fix today's AS_BOX regression
+       * lib/m4sugar/m4sh.m4 (_AS_BOX_LITERAL): Fix underquotation.
+       Reported by Stefano Lattarini.
+
        fortran: avoid misparsed FCLIBS from Fortran compiler
        * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Also skip
        'Configured by:' lines from gfortran.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index ca22161..13ad849 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1397,7 +1397,7 @@ m4_define([_AS_BOX],
 # _AS_BOX_LITERAL(MESSAGE, [FRAME-CHARACTER = `-'])
 # -------------------------------------------------
 m4_define([_AS_BOX_LITERAL],
-[AS_ECHO(["_AS_ESCAPE(m4_expand([m4_text_box($@)]), [`], [\"$])"])])
+[AS_ECHO(["_AS_ESCAPE(m4_dquote(m4_expand([m4_text_box($@)])), [`], [\"$])"])])


 # _AS_BOX_INDIR(MESSAGE, [FRAME-CHARACTER = `-'])
-- 
1.7.2.3