From ae774286e83d589aeddead8cef08b0670aec3035 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 6 Jan 2002 20:57:20 +0000 Subject: [PATCH] Creating package.m4 from configure.ac causes too many problems. * tests/Makefile.am (package.m4): Create it by hand, AC_CONFIG_TESTDIR no longer does in the most recent CVS Autoconf. --- ChangeLog | 7 +++++++ tests/Makefile.am | 26 +++++++++++++++++++++++--- tests/Makefile.in | 16 +++++++++++++--- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55e7a36e..6a9a085d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-01-06 Akim Demaille + + Creating package.m4 from configure.ac causes too many problems. + + * tests/Makefile.am (package.m4): Create it by hand, + AC_CONFIG_TESTDIR no longer does in the most recent CVS Autoconf. + 2002-01-04 Paul Eggert * doc/bison.texinfo (Debugging): diff --git a/tests/Makefile.am b/tests/Makefile.am index ac0c8bfb..3fff5ea8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to create Makefile.in. ## Makefile for Bison testsuite. -## Copyright 2000, 2001 Free Software Foundation, Inc. +## Copyright 2000, 2001, 2002 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -20,16 +20,36 @@ EXTRA_DIST = $(TESTSUITE_AT) testsuite -DISTCLEANFILES = atconfig bison package.m4 +DISTCLEANFILES = atconfig bison MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE) +## ------------ ## +## package.m4. ## +## ------------ ## + +$(srcdir)/package.m4: $(top_srcdir)/configure.in + { \ + echo '# Signature of the current package.'; \ + echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ + echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ + echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ + echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + } >$(srcdir)/package.m4 + +EXTRA_DIST += package.m4 + +## ------------ ## +## Test suite. ## +## ------------ ## + TESTSUITE_AT = \ testsuite.at \ output.at sets.at reduce.at calc.at torture.at regression.at TESTSUITE = $(srcdir)/testsuite AUTOTEST = $(AUTOM4TE) --language=autotest -$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT) +$(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp mv $@.tmp $@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 7f159380..7b06bdee 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -101,9 +101,9 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ -EXTRA_DIST = $(TESTSUITE_AT) testsuite +EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 -DISTCLEANFILES = atconfig bison package.m4 +DISTCLEANFILES = atconfig bison MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE) TESTSUITE_AT = \ @@ -234,7 +234,17 @@ uninstall-am: uninstall-info-am maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am uninstall-info-am -$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT) + +$(srcdir)/package.m4: $(top_srcdir)/configure.in + { \ + echo '# Signature of the current package.'; \ + echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ + echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ + echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ + echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + } >$(srcdir)/package.m4 +$(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp mv $@.tmp $@ -- 2.50.0