Fix testsuite failures with typical m4-x.y.z program suffix.

* tests/local.at (AT_CHECK_M4): Normalize hyphens and digits
after the `m4' program name.
* THANKS: Update.
Report by Luke Dalessandro.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 87768b8c201f29fc7ccc82a40965eda20d715c4a..686924cf77b08e7c088650e9af18ee733aa0d956 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix testsuite failures with typical m4-x.y.z program suffix.
+       * tests/local.at (AT_CHECK_M4): Normalize hyphens and digits
+       after the `m4' program name.
+       * THANKS: Update.
+       Report by Luke Dalessandro.
+
 2010-08-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix description of AC_CONFIG_TESTDIR to not mention atconfig.in.

diff --git a/THANKS b/THANKS
index fc5a9b75c3d66330ab82cb95b914c3e8c7e669c4..e26eb88f66595fe765d15e7391f7648b36c316ea 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -234,6 +234,7 @@ Laurence Darbe              ldarby@tuffmail.com
 Leo Moisio                  leo.moisio@gmail.com
 Loulou Pouchet              loulou@lrde.epita.fr
 Ludovic Courtes             ?
+Luke Dalessandro            luked@cs.rochester.edu
 Magnus Therning             therning@gforge.natlab.research.philips.com
 Manu                        manubee@wanadoo.fr
 Marc Espie                  Marc.Espie@liafa.jussieu.fr

diff --git a/tests/local.at b/tests/local.at
index 39360ef75eb2373815c97dd6aa59dd6012d76947..d1a48906b7eda44e51c868c57c77a33f74c60b1d 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -80,6 +80,11 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 #  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 this (GNU M4 1.4.13 installed as m4-1.4.13):
+#
+#  /usr/bin/m4-1.4.13:script.4s:1: include: cannot open `foo': No such file or directory
+#  autom4te: /usr/bin/m4-1.4.13 failed with exit status: 1
+#
 # becomes
 #
 #  m4:script.4s:1: cannot open `foo': No such file or directory
@@ -108,8 +113,8 @@ 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[.ex]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
-       s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[.ex]*: /m4:\1\2 /
+[AT_CHECK([[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 /