From: Eric Blake <ebb9@byu.net>
Date: Wed, 12 Dec 2007 21:41:53 +0000 (-0700)
Subject: Fix spurious testsuite failure with to M4 1.4.11.
X-Git-Tag: v2.62~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525da55580314168edd96d0fb843ff56a72a9214;p=thirdparty%2Fautoconf.git

Fix spurious testsuite failure with to M4 1.4.11.

* tests/local.at (AT_CHECK_M4): Cater to new m4 error message.

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

diff --git a/ChangeLog b/ChangeLog
index 77f83601..bcf598a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-12  Eric Blake  <ebb9@byu.net>
 
+	Fix spurious testsuite failure with M4 1.4.11.
+	* tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
+
 	Optimize AC_REQUIRE.
 	* lib/m4sugar/m4sugar.m4 (m4_expansion_stack_push, _m4_defun_pro)
 	(_m4_defun_pro_outer, _m4_defun_epi, _m4_defun_epi_outer)
diff --git a/tests/local.at b/tests/local.at
index 855ebd35..9caac755 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -63,11 +63,16 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 # AT_CHECK_M4(COMMAND, [EXIT-STATUS = 0], STDOUT, STDERR)
 # -------------------------------------------------------
 # If stderr is specified, normalize the observed stderr.
-# This (using GNU M4 1.4.6 or later)
+# This (using GNU M4 1.4.6)
 #
 #  /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory
 #  autom4te: /usr/local/bin/m4 failed with exit status: 1
 #
+# or this (GNU M4 1.4.11)
+#
+#  /usr/local/bin/m4:script.4s:1: include: cannot open `foo': No such file or directory
+#  autom4te: /usr/local/bin/m4 failed with exit status: 1
+#
 # or this (GNU M4 1.4 installed as gm4)
 #
 #  script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
@@ -86,6 +91,7 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 #
 # and
 #     m4:(file):(line): Cannot open foo:
+# or  m4:(file):(line): include: cannot open `foo':
 # to  m4:(file):(line): cannot open `foo':
 #
 # and
@@ -102,7 +108,8 @@ m4_define([AT_CHECK_M4],
 m4_case([$4], [], [], [ignore], [],
 [AT_CHECK([[sed 's/^[^:]*m4: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
 	s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4: /m4:\1\2 /
-	s/^\(m4:[^:]*:[0-9][0-9]*: \)C\(annot open \)\([^`:]*\):/\1c\2`\3'\'':/
+	s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
+	s/: include:\( cannot open\)/:\1/
 	s/^autom4te: [^ ]*m4 /autom4te: m4 /
 	s/^autom4te: [^ ]*m4\.exe /autom4te: m4 /
 	s/ (E[A-Z]*)$//