* lib/autoconf/autotest.m4: Create `package.m4'.

* tests/Makefile.am (package.m4): Remove.
This commit is contained in:
Akim Demaille 2001-09-22 15:21:20 +00:00
parent a9bd52773e
commit 4153a98f4e
4 changed files with 28 additions and 32 deletions

View File

@ -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__'.

View File

@ -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'

View File

@ -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. ##
## ------------------ ##

View File

@ -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)