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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 1cc7cd679866b50a9881255350e198e8c0ff5d4f..c2147d919d91b5ad622d59cf174193b65fd0dd33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-25  Eric Blake  <ebb9@byu.net>
 
+       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 14809532f8136352b76a68ee6e395b7a681d1aa9..3e201b98f5bb443f7ff9b238c474743ed5c0c24e 100644 (file)
--- 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])