From 4153a98f4e237cc7fdf365eea6806239c47b0492 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Sat, 22 Sep 2001 15:21:20 +0000
Subject: [PATCH] * lib/autoconf/autotest.m4: Create `package.m4'. *
 tests/Makefile.am (package.m4): Remove.

---
 ChangeLog                |  5 +++++
 lib/autoconf/autotest.m4 | 28 +++++++++++++++++++++++-----
 tests/Makefile.am        | 17 -----------------
 tests/Makefile.in        | 10 ----------
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c35ac11..dcc5f19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-22  Akim Demaille  <akim@epita.fr>
+
+	* lib/autoconf/autotest.m4: Create `package.m4'.
+	* tests/Makefile.am (package.m4): Remove.
+
 2001-09-22  Akim Demaille  <akim@epita.fr>
 
 	Rely on `$LINENO' when possible instead of `__oline__'.
diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index 22fda540..cead6da7 100644
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -58,13 +58,31 @@
 # AUTOTEST-PATH must help the test suite to find the executables.
 # It is relative to the top level of the package, and is expanded
 # into all the build dirs of AUTOTEST-PATH, then all the src dirs.
-AC_DEFUN([AC_CONFIG_TESTDIR],
-[AC_CONFIG_COMMANDS([$1/atconfig],
-[# Do not use _ACEOF as we are being dumped into config.status via
+#
+# Do not use _ACEOF as we are being dumped into config.status via
 # an _ACEOF-heredoc.
-cat >$1/atconfig <<ATEOF
+AC_DEFUN([AC_CONFIG_TESTDIR],
+[AC_CONFIG_COMMANDS([$1/package.m4],
+[[cat >$1/package.m4 <<ATEOF
+@%:@ Signature of the current package.
+m4@&t@_define([PACKAGE_NAME],      [$PACKAGE_NAME])
+m4@&t@_define([PACKAGE_TARNAME],   [$PACKAGE_TARNAME])
+m4@&t@_define([PACKAGE_VERSION],   [$PACKAGE_VERSION])
+m4@&t@_define([PACKAGE_STRING],    [$PACKAGE_STRING])
+m4@&t@_define([PACKAGE_BUGREPORT], [$PACKAGE_BUGREPORT])
+ATEOF
+]],
+[[PACKAGE_NAME='$PACKAGE_NAME'
+PACKAGE_TARNAME='$PACKAGE_TARNAME'
+PACKAGE_VERSION='$PACKAGE_VERSION'
+PACKAGE_STRING='$PACKAGE_STRING'
+PACKAGE_BUGREPORT='$PACKAGE_BUGREPORT'
+]])
+
+AC_CONFIG_COMMANDS([$1/atconfig],
+[cat >$1/atconfig <<ATEOF
 @%:@ Configurable variable values for building test suites.
-@%:@ Generated by $[0]
+@%:@ Generated by $[0].
 @%:@ Copyright 2000, 2001 Free Software Foundation, Inc.
 
 at_testdir='$1'
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83656a9b..10f01c9a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,23 +78,6 @@ installcheck-local:
 
 
 
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-package.m4: $(top_srcdir)/configure.ac
-	{					\
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >package.m4
-
-
-
-
 ## ------------------ ##
 ## Maintainer rules.  ##
 ## ------------------ ##
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a8bc7ec9..4f4a3af2 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -268,16 +268,6 @@ check-local: atconfig atlocal $(TESTSUITE)
 installcheck-local:
 	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 
-package.m4: $(top_srcdir)/configure.ac
-	{					\
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >package.m4
-
 $(TESTSUITE_GENERATED_AT): mktests.sh $(AUTOCONF_FILES)
 	cd $(srcdir) && ./mktests.sh $(AUTOCONF_FILES)