From: Eric Blake <ebb9@byu.net>
Date: Fri, 31 Oct 2008 00:50:39 +0000 (-0600)
Subject: Fix LINENO testsuite failure.
X-Git-Tag: v2.63b~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4ca1ca2669e1f73d10aec9674b84461d81dd431;p=thirdparty%2Fautoconf.git

Fix LINENO testsuite failure.

* tests/m4sh.at (AT_DATA_LINENO): Use AS_LINENO_PREPARE, not
undocumented _AS_PREPARE, and move unset earlier in script.

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

diff --git a/ChangeLog b/ChangeLog
index b1be7a5b5..457d71114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-30  Eric Blake  <ebb9@byu.net>
 
+	Fix LINENO testsuite failure.
+	* tests/m4sh.at (AT_DATA_LINENO): Use AS_LINENO_PREPARE, not
+	undocumented _AS_PREPARE, and move unset earlier in script.
+
 	Update LINENO documentation.
 	* doc/autoconf.texi (Initialization Macros) <AS_INIT_GENERATED>:
 	(Special Shell Variables) <LINENO>: Mention that LINENO support in
diff --git a/tests/m4sh.at b/tests/m4sh.at
index e90e23193..55363d8a8 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -52,10 +52,12 @@ AT_CHECK([test -n "${ZSH_VERSION+set}" && exit 77], ignore)
 m4_define([AT_DATA_LINENO],
 [AT_DATA([$1.tas],
 [[AS@&t@_INIT
+m4@&t@_divert_text([0], [
 if $2; then
   AS@&t@_UNSET([LINENO])
 fi
-_AS@&t@_PREPARE
+])
+AS@&t@_LINENO_PREPARE
 echo "Line: $3"
 grep 'Line: .*$4' "$[0]" >/dev/null ||
   AS@&t@_ERROR([cannot find original script])