* tests/atspecific.m4 (AT_CHECK_AUTOM4TE): Be robust to different

m4 executable names, and different GNU M4 version.
Reported by Ezra Peisach and Paul Jarc.

diff --git a/ChangeLog b/ChangeLog
index 0f138d8cefdb3a07278d03792d1da4e20d895075..bc8983ecc2938c75a8d6ffc0a7fe6cd17b548ddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-28  Akim Demaille  <akim@epita.fr>
+
+       * tests/atspecific.m4 (AT_CHECK_AUTOM4TE): Be robust to different
+       m4 executable names, and different GNU M4 version.
+       Reported by Ezra Peisach and Paul Jarc.
+
 2002-10-27  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/functions.m4 (_AC_FUNC_VFORK): Really use

diff --git a/Makefile.in b/Makefile.in
index fb201572b5b57fcfe530f7faad4a375bcc42735d..2d89f2921b43eaa36542d69212039c2aee10fdfb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@

diff --git a/THANKS b/THANKS
index b8d3019d65fbdd58b8c72db70d8ccecdd6272948..adb9e016f3b626cf6a49095bc300754af164f9f7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -141,6 +141,7 @@ Patrick Welche              prlw1@newn.cam.ac.uk
 Paul Berrevoets             paul@swi.com
 Paul Eggert                 eggert@twinsun.com
 Paul Gampe                  paulg@apnic.net
+Paul Jarc                   prj@po.cwru.edu
 Paul Martinolich            martinol@datasync.com
 Pavel Roskin                pavel_roskin@geocities.com
 Peter Eisentraut            peter_e@gmx.net

diff --git a/bin/Makefile.in b/bin/Makefile.in
index b00cbc4a22f0e52c89a41d523504b53affa30cbb..8a2e32127a99838eaae89886c3209cd7a68d018b 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -53,6 +53,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@

diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 1b928f4f497bf9ae18c8d6ad32040a03b5f2072a..7bd5cb05334cff2ef8bdd17f9711982286e0533e 100644 (file)
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -25,20 +25,37 @@
 
 # AT_CHECK_AUTOM4TE(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
 # -----------------------------------------------------------
-# If stderr is specified, normalize the observed stderr.  E.g.:
+# If stderr is specified, normalize the observed stderr.  E.g. (GNU M4 1.5):
 #
 #  /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):
+#
+#  script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
+#  autom4te: /usr/local/bin/m4 failed with exit status: 1
+#
 # becomes
 #
 #  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):
+# to  m4: (file): (line):
+#
+# and
+#     autom4te: [^ ]m4
+# to  autom4te: m4
 m4_define([AT_CHECK_AUTOM4TE],
 [AT_CHECK([autom4te $1], [$2], [$3], m4_ifval([$4], [stderr]))
 m4_ifval([$4],
-[AT_CHECK([[sed 's,[^ ]*/m4,m4,' stderr]], [0],[$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 /' \
+           stderr]], [0],[$4])])
 ])