From: Eric Blake <ebb9@byu.net>
Date: Mon, 1 Oct 2007 22:22:54 +0000 (-0600)
Subject: Once again, reject IRIX m4.
X-Git-Tag: v2.62~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83294abba1e858e99b558a541b13d4eba53e5daa;p=thirdparty%2Fautoconf.git

Once again, reject IRIX m4.

* m4/m4.m4 (AC_PROG_GNU_M4): Use indir builtin to root out non-GNU
implementations that ignore --trace.
* configure: Regenerate.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 1e092015..1a3b08dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-01  Eric Blake  <ebb9@byu.net>
 
+	Once again, reject IRIX m4.
+	* m4/m4.m4 (AC_PROG_GNU_M4): Use indir builtin to root out non-GNU
+	implementations that ignore --trace.
+	* configure: Regenerate.
+	Reported by Ralf Wildenhues.
+
 	Fix regression in AC_DEFINE([macro(with_arg)]).
 	* lib/autoconf/general.m4 (AC_DEFINE_TRACE): Don't chop off close
 	quotes with a careless m4_substr.
diff --git a/configure b/configure
index f0b5215e..434301a8 100755
--- a/configure
+++ b/configure
@@ -2362,7 +2362,9 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_M4="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_M4" && $as_test_x "$ac_path_M4"; } || continue
-      test -z "`echo if'def(mac,bug)d'nl | $ac_path_M4 --trace=mac 2>&1`" \
+      # Root out GNU M4 1.4.4, as well as non-GNU m4 that ignore --trace.
+      ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)d'nl
+      test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
       $ac_path_M4_found && break 3
     done
diff --git a/m4/m4.m4 b/m4/m4.m4
index 70f30767..711bd58a 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -17,7 +17,9 @@ AC_DEFUN([AC_PROG_GNU_M4],
   AC_CACHE_CHECK([for GNU M4 that supports accurate traces], [ac_cv_path_M4],
     [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4],
       [dnl Creative quoting here to avoid raw dnl and ifdef in configure.
-      test -z "`echo if'def(mac,bug)d'nl | $ac_path_M4 --trace=mac 2>&1`" \
+      # Root out GNU M4 1.4.4, as well as non-GNU m4 that ignore --trace.
+      ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)d'nl
+      test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:],
       [AC_MSG_ERROR([no acceptable m4 could be found in \$PATH.
 GNU M4 1.4.5 or later is required; 1.4.8 is recommended])])])