2006-09-08  Stepan Kasal  <address@hidden>

	* tests/local.at (AT_CHECK_M4): Fix this so that the testsuite
	  works with GNU M4 1.4.3 again; fix the description.

Index: tests/local.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/local.at,v
retrieving revision 1.34
diff -u -r1.34 local.at
--- tests/local.at	24 Aug 2006 22:56:47 -0000	1.34
+++ tests/local.at	8 Sep 2006 12:33:00 -0000
@@ -63,9 +63,9 @@
 
 # AT_CHECK_M4(COMMAND, [EXIT-STATUS = 0], STDOUT, STDERR)
 # -------------------------------------------------------
-# If stderr is specified, normalize the observed stderr.  E.g. (GNU M4 1.5):
+# If stderr is specified, normalize the observed stderr.  E.g. (GNU M4 2.0):
 #
-#  /usr/local/bin/m4: script.4s: 1: Cannot open foo: No such file or directory
+#  /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 (using gm4 as GNU M4 1.4):
@@ -73,30 +73,42 @@
 #  script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
 #  autom4te: /usr/local/bin/gm4 failed with exit status: 1
 #
+# or (using GNU M$ 1.4.6):
+#  /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory
+#
 # becomes
 #
-#  m4: script.4s: 1: Cannot open foo: No such file or directory
+#  m4: script.4s: 1: cannot open `foo': No such file or directory
 #  autom4te: m4 failed with exit status: 1
 #
 # We use the following sed patterns:
 #
-#     (file): (line): (m4):
-# or  (m4): (file): (line):
+#     (m4): (file): (line):
+# or  (file): (line): (m4):
 # to  m4: (file): (line):
 #
 # and
+#     m4: (file): (line): Cannot open foo:
+# to  m4: (file): (line): cannot open `foo':
+#
+# and
 #     autom4te: [^ ]m4
 # or  autom4te: [^ ]m4.exe
 # to  autom4te: m4
+#
+# Moreover, DJGPP's error messages include the error code in brackets;
+# remove the error code during normalization.
+#
 m4_define([AT_CHECK_M4],
 [AT_CHECK([$1], [$2], [$3], m4_ifval([$4], [stderr]))
 m4_ifval([$4],
-[AT_CHECK([[sed -e 's/^\([^:]*\): *\([0-9][0-9]*\): *[^:]*m4: /m4: \1: \2: /' \
-		-e 's/^[^:]*m4: *\([^:]*\): *\([0-9][0-9]*\): /m4: \1: \2: /' \
-		-e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \
-		-e 's/^autom4te: [^ ]*m4\.exe /autom4te: m4 /' \
-		-e 's/ (E[A-Z]*)$//' \
-	   stderr]], [0],[$4])])
+[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/^autom4te: [^ ]*m4 /autom4te: m4 /
+	s/^autom4te: [^ ]*m4\.exe /autom4te: m4 /
+	s/ (E[A-Z]*)$//
+    ' stderr]], [0],[$4])])
 ])
 
 # AT_CHECK_AUTOM4TE(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)