* autoconf.in (M4): Pass --nesting-limit=1024, unless already set

in $M4.
Suggested by Andreas Schwab.

diff --git a/ChangeLog b/ChangeLog
index 3d6fcc642f7fb7c7d58392521d222b1e65469476..54435f1e4fff698d398744e61e7d9c394ef0a034 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-18  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.in (M4): Pass --nesting-limit=1024, unless already set
+       in $M4.
+       Suggested by Andreas Schwab.
+
 2001-06-18  Akim Demaille  <akim@epita.fr>
 
        * acfunctions.m4 (AC_FUNC_CHOWN, AC_FUNC_CLOSEDIR_VOID)

diff --git a/autoconf.in b/autoconf.in
index bd0e19d5058410fe956b8ed8075902ce2fa5fece..04bc53e593792cd624ccca6ce21facf11a71f713 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -105,6 +105,16 @@ case `$M4 --help </dev/null 2>&1` in
 *) echo "$me: Autoconf requires GNU m4 1.4 or later" >&2; exit 1 ;;
 esac
 
+# Set some high recursion limit as the default limit, 250, has already
+# been hit with AC_OUTPUT.
+case " $M4 " in
+  *" --nesting-limit"* | *" -L"* )
+  # Don't override the user's choice
+  ;;
+  *) M4="$M4 --nesting-limit=1024"
+  ;;
+esac
+
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=@datadir@}}
 test -z "$AC_ACLOCALDIR" &&

diff --git a/bin/autoconf.in b/bin/autoconf.in
index bd0e19d5058410fe956b8ed8075902ce2fa5fece..04bc53e593792cd624ccca6ce21facf11a71f713 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -105,6 +105,16 @@ case `$M4 --help </dev/null 2>&1` in
 *) echo "$me: Autoconf requires GNU m4 1.4 or later" >&2; exit 1 ;;
 esac
 
+# Set some high recursion limit as the default limit, 250, has already
+# been hit with AC_OUTPUT.
+case " $M4 " in
+  *" --nesting-limit"* | *" -L"* )
+  # Don't override the user's choice
+  ;;
+  *) M4="$M4 --nesting-limit=1024"
+  ;;
+esac
+
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=@datadir@}}
 test -z "$AC_ACLOCALDIR" &&