From b0ca762d70a1201759991ff00e576948b03dd6fc Mon Sep 17 00:00:00 2001 From: Benoit Sigoure Date: Thu, 1 Nov 2007 16:10:36 +0100 Subject: [PATCH] Fix distcheck. * configure.ac: Use AC_CONFIG_HEADERS. * tests/Makefile.am (CLEANFILES): New. Make package.m4 depend on Makefile.in. Disable installcheck-local. Signed-off-by: Benoit Sigoure --- ChangeLog | 7 +++++++ configure.ac | 9 +-------- tests/Makefile.am | 9 +++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a83295c..e6fcb77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-11-01 Benoit Sigoure + Fix distcheck. + * configure.ac: Use AC_CONFIG_HEADERS. + * tests/Makefile.am (CLEANFILES): New. + Make package.m4 depend on Makefile.in. Disable installcheck-local. + +2007-11-01 Benoit Sigoure + Add macros to check for Boost libraries and headers. * build-aux/boost.m4 (BOOST_REQUIRE): Restrain variable names to the pseudo /_?boost/i namespace. Look up the version string of Boost in diff --git a/configure.ac b/configure.ac index f7b442d..125efdf 100644 --- a/configure.ac +++ b/configure.ac @@ -15,21 +15,14 @@ AC_INIT([boost-m4-test], [0.1], [tsuna@lrde.epita.fr]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_GREP AC_PROG_EGREP AC_PROG_CXX -version=1.34 -dnl version=bad -dnl version=1. -dnl BOOST_REQUIRE([$version]) BOOST_REQUIRE([1.34]) -dnl BOOST_REQUIRE -dnl BOOST_REQUIRE([plop]) -dnl m4_define([b_version], [1.34]) -dnl BOOST_REQUIRE(b_version) # Initialize the test suite. AC_CONFIG_TESTDIR([tests]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 877e819..fd88a41 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,8 +15,9 @@ EXTRA_DIST = testsuite.at $(TESTSUITE) atlocal.in package.m4 TESTSUITE = $(srcdir)/testsuite +CLEANFILES = atconfig -$(srcdir)/package.m4: Makefile +$(srcdir)/package.m4: Makefile.in { \ echo '# Signature of the current package.'; \ echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \ @@ -29,9 +30,9 @@ $(srcdir)/package.m4: Makefile check-local: atconfig atlocal $(TESTSUITE) $(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS) -# Run the test suite on the *installed* tree. -installcheck-local: atconfig atlocal $(TESTSUITE) - $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS) +# Run the test suite on the *installed* tree (not necessary ATM => disabled). +#installcheck-local: atconfig atlocal $(TESTSUITE) +# $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS) clean-local: test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean -- 2.11.4.GIT