* autom4te.in ($m4): Handle the --nesting-limit.

* autoconf.in (M4): Remove.

diff --git a/ChangeLog b/ChangeLog
index 43a4c5e4557f38461e32bdb503fe479ed08efeac..a2c2ffe00e9ae2fcc2fafa8ed1aa7a01ddfceaa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-01  Akim Demaille  <akim@epita.fr>
+
+       * autom4te.in ($m4): Handle the --nesting-limit.
+       * autoconf.in (M4): Remove.
+
 2001-08-01  Akim Demaille  <akim@epita.fr>
 
        * autoconf.in ($AWK): Remove, no longer used.

diff --git a/autoconf.in b/autoconf.in
index 0027f1fcd8e05379fbd0d7bbc0da1ab5e7349d7f..2ea8c71baad20c5c6078dffdddc29db11c42266e 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -95,30 +95,6 @@ outfile=
 status=0
 verbose=:
 
-# Find GNU m4.
-# Handle the case that m4 has moved since we were configured.
-# It may have been found originally in a build directory.
-: ${M4=@M4@}
-case "$M4" in
-  [\\/]* | ?:[\\/]*) test -f "$M4" || M4=m4 ;;
-esac
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
-case `$M4 --help </dev/null 2>&1` in
-*reload-state*);;
-*) 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
-
-
 # We test "$dir/autom4te" in case we are in the build tree, in which case
 # the names are not transformed yet.
 for autom4te in "$AUTOM4TE" \

diff --git a/autom4te.in b/autom4te.in
index bee933ad3fbaa06b3e5117b4fe4c2cac6a6db8e5..0887cb0bf5acea96c6b6dac1334fb8af8eb33507 100644 (file)
--- a/autom4te.in
+++ b/autom4te.in
@@ -268,6 +268,11 @@ my $m4 = $ENV{"M4"} || '@M4@';
 die "$me: need GNU m4 1.4 or later: $m4\n"
   if system "$m4 --help </dev/null 2>&1 | fgrep reload-state >/dev/null";
 
+# Set some high recursion limit as the default limit, 250, has already
+# been hit with AC_OUTPUT.  Don't override the user's choice.
+$m4 .= ' --nesting-limit=1024'
+  if " $m4 " !~ / (--nesting-limit|-L) /;
+
 # @M4_BUILTINS -- M4 builtins and a useful comment.
 my @m4_builtins = `echo dumpdef | $m4 2>&1 >/dev/null`;
 map { s/:.*//;s/\W// } @m4_builtins;

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 0027f1fcd8e05379fbd0d7bbc0da1ab5e7349d7f..2ea8c71baad20c5c6078dffdddc29db11c42266e 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -95,30 +95,6 @@ outfile=
 status=0
 verbose=:
 
-# Find GNU m4.
-# Handle the case that m4 has moved since we were configured.
-# It may have been found originally in a build directory.
-: ${M4=@M4@}
-case "$M4" in
-  [\\/]* | ?:[\\/]*) test -f "$M4" || M4=m4 ;;
-esac
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
-case `$M4 --help </dev/null 2>&1` in
-*reload-state*);;
-*) 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
-
-
 # We test "$dir/autom4te" in case we are in the build tree, in which case
 # the names are not transformed yet.
 for autom4te in "$AUTOM4TE" \

diff --git a/bin/autom4te.in b/bin/autom4te.in
index bee933ad3fbaa06b3e5117b4fe4c2cac6a6db8e5..0887cb0bf5acea96c6b6dac1334fb8af8eb33507 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -268,6 +268,11 @@ my $m4 = $ENV{"M4"} || '@M4@';
 die "$me: need GNU m4 1.4 or later: $m4\n"
   if system "$m4 --help </dev/null 2>&1 | fgrep reload-state >/dev/null";
 
+# Set some high recursion limit as the default limit, 250, has already
+# been hit with AC_OUTPUT.  Don't override the user's choice.
+$m4 .= ' --nesting-limit=1024'
+  if " $m4 " !~ / (--nesting-limit|-L) /;
+
 # @M4_BUILTINS -- M4 builtins and a useful comment.
 my @m4_builtins = `echo dumpdef | $m4 2>&1 >/dev/null`;
 map { s/:.*//;s/\W// } @m4_builtins;