[SCM] GNU Autoconf source repository branch, master, updated. v2.62-53-ge48d698

[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=e48d698fdc54635576c491b1ed2c66fa289d80f9

The branch, master has been updated
       via  e48d698fdc54635576c491b1ed2c66fa289d80f9 (commit)
      from  dbb9fe36bfb9cdd2d1c4b13a752ca3bb7bb049a7 (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 e48d698fdc54635576c491b1ed2c66fa289d80f9
Author: Eric Blake <address@hidden>
Date:   Fri Jul 25 21:13:23 2008 -0600

    Avoid infinite aclocal loop.
    
    * lib/m4sugar/m4sugar.m4 (m4_init): Bypass m4_include tracing, so
    that aclocal doesn't insist on finding m4sugar/foreach.m4.
    
    Signed-off-by: Eric Blake <address@hidden>

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

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

diff --git a/ChangeLog b/ChangeLog
index 1cc7cd6..c2147d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-25  Eric Blake  <address@hidden>
 
+       Avoid infinite aclocal loop.
+       * lib/m4sugar/m4sugar.m4 (m4_init): Bypass m4_include tracing, so
+       that aclocal doesn't insist on finding m4sugar/foreach.m4.
+
        Provide O(n) replacement macros for M4 1.4.x.
        * lib/m4sugar/foreach.m4: New file.
        (m4_foreach, m4_case, _m4_shiftn, m4_do, m4_dquote_elt, _m4_map)
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 1480953..3e201b9 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -2315,8 +2315,9 @@ m4_pattern_forbid([^dnl$])
 # 1.6 or newer, and thus that $@ recursion is linear; nothing further
 # needs to be done.  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.
-m4_ifndef([__m4_version__], [m4_include([m4sugar/foreach.m4])])
+# foreach-based replacement macros.  Use the raw builtin to avoid
+# tripping up include tracing.
+m4_ifndef([__m4_version__], [m4_builtin([include], [m4sugar/foreach.m4])])
 
 # _m4_divert_diversion should be defined:
 m4_divert_push([KILL])


hooks/post-receive
--
GNU Autoconf source repository