FYI: 09-autoconf-doesn-t-need-m4.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * autom4te.in ($m4): Handle the --nesting-limit.
        * autoconf.in (M4): Remove.
        
Index: autoconf.in
--- autoconf.in Sun, 29 Jul 2001 09:44:07 +0200 akim (ace/17_autoconf.s 
1.31.8.52 644)
+++ autoconf.in Sun, 29 Jul 2001 09:49:40 +0200 akim (ace/17_autoconf.s 
1.31.8.52 644)
@@ -95,30 +95,6 @@
 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.
-: address@hidden@}
-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" \
Index: autom4te.in
--- autom4te.in Sun, 29 Jul 2001 09:44:07 +0200 akim (ace/c/10_autom4te.i 1.8 
644)
+++ autom4te.in Sun, 29 Jul 2001 09:49:02 +0200 akim (ace/c/10_autom4te.i 1.8 
644)
@@ -268,6 +268,11 @@ sub load
 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;