[SCM] GNU Autoconf source repository branch, master, updated. v2.63-239-g0aae415

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=0aae415c0c873d72b660927e6d1b648a7b438afe

The branch, master has been updated
       via  0aae415c0c873d72b660927e6d1b648a7b438afe (commit)
      from  276044d3556000a8aa1f23beb2520d8249fa39ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0aae415c0c873d72b660927e6d1b648a7b438afe
Author: Eric Blake <address@hidden>
Date:   Tue Dec 9 10:47:19 2008 -0700

    Fix m4_location inside m4_wrap with m4 1.4.5.
    
    * lib/m4sugar/m4sugar.m4 (m4_undefine): Redefine m4_location
    inside wrapped text if older m4 is detected.
    Reported by William Pursell.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    7 +++++++
 lib/m4sugar/m4sugar.m4 |   13 +++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17eadc7..fb31bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-09  Eric Blake  <address@hidden>
+
+       Fix m4_location inside m4_wrap with m4 1.4.5.
+       * lib/m4sugar/m4sugar.m4 (m4_undefine): Redefine m4_location
+       inside wrapped text if older m4 is detected.
+       Reported by William Pursell.
+
 2008-12-08  William Pursell  <address@hidden>  (tiny change)
        and Eric Blake  <address@hidden>
 
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index e3b712a..fe6af4f 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -200,6 +200,7 @@ m4_copy([m4_undefine], [_m4_undefine])
 
 # m4_location
 # -----------
+# Output the current file, colon, and the current line number.
 m4_define([m4_location],
 [__file__:__line__])
 
@@ -3055,15 +3056,19 @@ m4_pattern_forbid([^dnl$])
 # is available for faster checks of dereferencing undefined macros.
 # But if it is missing, we assume we are being run by M4 1.4.x, that
 # $@ recursion is quadratic, and that we need foreach-based
-# replacement macros.  Use the raw builtin to avoid tripping up
-# include tracing.  Meanwhile, avoid m4_copy, since it temporarily
-# undefines m4_defn.
+# replacement macros.  Also, m4 prior to 1.4.8 loses track of location
+# during m4wrap text; __line__ should never be 0.
+#
+# Use the raw builtin to avoid tripping up include tracing.
+# Meanwhile, avoid m4_copy, since it temporarily undefines m4_defn.
 m4_ifdef([__m4_version__],
 [m4_debugmode([+d])
 m4_define([m4_defn], _m4_defn([_m4_defn]))
 m4_define([m4_popdef], _m4_defn([_m4_popdef]))
 m4_define([m4_undefine], _m4_defn([_m4_undefine]))],
-[m4_builtin([include], [m4sugar/foreach.m4])])
+[m4_builtin([include], [m4sugar/foreach.m4])
+m4_wrap_lifo([m4_if(__line__, [0], [m4_pushdef([m4_location],
+]]m4_dquote(m4_dquote(m4_dquote(__file__:__line__)))[[)])])])
 
 # Rewrite the first entry of the diversion stack.
 m4_divert([KILL])


hooks/post-receive
--
GNU Autoconf source repository