From: Zack Weinberg <zackw@panix.com>
Date: Fri, 13 Sep 2013 15:26:08 +0000 (-0400)
Subject: * tests/local.at (AT_CHECK_M4): Support 'stderr' as fourth argument.
X-Git-Tag: v2.69b~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1b936ff6c8462a8ffe9f2c7707f6b580549253d;p=thirdparty%2Fautoconf.git

* tests/local.at (AT_CHECK_M4): Support 'stderr' as fourth argument.
---

diff --git a/tests/local.at b/tests/local.at
index 97a1e1d18..47501bf96 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -113,13 +113,14 @@ m4_define([AT_CHECK_M4],
 [AT_CHECK([$1], [$2], [$3],
           m4_case([$4], [], [], [ignore], [ignore], [stderr]))
 m4_case([$4], [], [], [ignore], [],
-[AT_CHECK([[sed 's/^[^:]*m4[-.ex0-9]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
+[AT_CHECK([[mv stderr stderr-raw &&
+   sed 's/^[^:]*m4[-.ex0-9]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
 	s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[-.ex0-9]*: /m4:\1\2 /
 	s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
 	s/: include:\( cannot open\)/:\1/
 	s/^autom4te: [^ ]*m4[.ex]* /autom4te: m4 /
 	s/ (E[A-Z]*)$//
-    ' stderr >&2]], [0], [], [$4])])
+    ' stderr-raw >&2]], [0], [], [$4])])
 ])
 
 # AT_CHECK_AUTOM4TE(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)