Savannah Git Hosting - m4.git/commitdiff

Depend on newer autoconf, for testsuite -C dir.

2008年1月28日 15:03:16 +0000 (08:03 -0700)

* Makefile.am (CD_TESTDIR): Delete, no longer required.
(check-local, installcheck-local, clean-local-tests): Use new -C
option from autotest.
* configure.ac (AC_PREREQ): Bump to 2.61a.347.
* bootstrap: Mention new dependency.
* HACKING: Likewise.

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

ChangeLog patch | blob | history

HACKING patch | blob | history

Makefile.am patch | blob | history

bootstrap patch | blob | history

configure.ac patch | blob | history

diff --git a/ChangeLog b/ChangeLog

index 34b94919cb9a28285fe1ff30b08d18888d9f0315..612654b05140a786d28899c4db52fc7a16f067d2 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,13 @@

+2008年01月28日 Eric Blake <ebb9@byu.net>

+ Depend on newer autoconf, for testsuite -C dir.

+ * Makefile.am (CD_TESTDIR): Delete, no longer required.

+ (check-local, installcheck-local, clean-local-tests): Use new -C

+ option from autotest.

+ * configure.ac (AC_PREREQ): Bump to 2.61a.347.

+ * bootstrap: Mention new dependency.

+ * HACKING: Likewise.

2008年01月27日 Eric Blake <ebb9@byu.net>

Stage 13: push composite text tokens.

diff --git a/HACKING b/HACKING

index f81dd05a040a1b20701f08245d63bd680737862c..c5d07c8ea76d8b1d3e855c8f48331df357630c42 100644 (file)

--- a/HACKING

+++ b/HACKING

@@ -64,7 +64,7 @@ and is not part of a release distribution.

* Before you can build from git, you need to bootstrap. This requires:

- A pre-installed version of GNU M4 1.4.5 or later, built from a

package

- - Autoconf 2.60 or later

+ - A git checkout of Autoconf (will become Autoconf 2.62)

- Automake 1.10.1 or later

- CVS Head of Libtool (will become Libtool 2.0)

- Gettext 0.16 or later

diff --git a/Makefile.am b/Makefile.am

index e79210c4880d26ad1e6fdcf17afff2eb10f8b312..86260315b4c40a593b0152907afc8d61024e227e 100644 (file)

--- a/Makefile.am

+++ b/Makefile.am

@@ -403,30 +403,20 @@ tests/atconfig: config.status

$(SHELL) ./config.status tests/atconfig

DISTCLEANFILES += tests/atconfig

-# FIXME - After 2.60, autoconf might add an option to testsuite to specify

-# which directory it should output testsuite.log. Until then, we want it

-# to drop in tests, so we have to do a cd inside the targets that invoke

-# testsuite. As a result, we need an absolute path since the relative

-# $(srcdir) inside $(TESTSUITE) does not work after cd.

-CD_TESTDIR = cd ./tests

# Hook the test suite into the check rule

check-local: tests/atconfig tests/m4 $(TESTSUITE) $(check_LTLIBRARIES)

- $(CD_TESTDIR); \

- $(SHELL) '$(abs_srcdir)/tests/testsuite' $(TESTS_ENVIRONMENT) \

- $(TESTSUITEFLAGS)

+ $(SHELL) '$(srcdir)/tests/testsuite' -C tests \

+ $(TESTS_ENVIRONMENT) $(TESTSUITEFLAGS)

# Run the test suite on the *installed* tree.

installcheck-local: tests/atconfig $(TESTSUITE) $(check_LTLIBRARIES)

- $(CD_TESTDIR); \

- $(SHELL) '$(abs_srcdir)/tests/testsuite' $(TESTS_ENVIRONMENT) \

- AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)

+ $(SHELL) '$(srcdir)/tests/testsuite' -C tests \

+ $(TESTS_ENVIRONMENT) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)

# We need to remove any file droppings left behind by testsuite.

clean-local-tests:

- $(CD_TESTDIR); \

- test ! -f '$(abs_srcdir)/tests/testsuite' || \

- $(SHELL) '$(abs_srcdir)/tests/testsuite' --clean

+ test ! -f '$(srcdir)/tests/testsuite' || \

+ $(SHELL) '$(srcdir)/tests/testsuite' -C tests --clean

OTHER_FILES = tests/iso8859.m4 tests/stackovf.test \

tests/null.m4 tests/null.out tests/null.err

diff --git a/bootstrap b/bootstrap

index 8da38fd3f684d82faf209dd89b7f64ee8aff065a..2dcede219caaa3ccfc0f58d377c217ea35b8bde5 100755 (executable)

--- a/bootstrap

+++ b/bootstrap

@@ -1,6 +1,6 @@

#! /bin/sh

-# bootstrap (GNU M4) version 2008年01月2日2

+# bootstrap (GNU M4) version 2008年01月2日8

# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>

# This is free software: you are free to change and redistribute it.

@@ -39,9 +39,9 @@

# This script bootstraps a git or CVS checkout of GNU M4 by correctly calling

# out to parts of the GNU Build Platform. Currently this requires GNU

-# Gettext 0.16 or better, Autoconf 2.60 or better, GNU M4 1.4.x or

-# better, a git snapshot of Automake 1.10.1 or better, a CVS snapshot

-# of Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.

+# Gettext 0.16 or better, a git snapshot of Autoconf 2.61a or better,

+# GNU M4 1.4.x or better, Automake 1.10.1 or better, a CVS snapshot of

+# Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.

# Libtool must be installed; either with the same --prefix as

# automake, or made accessible to aclocal's search path via

# $AUTOMAKE_prefix/share/aclocal/dirlist.

diff --git a/configure.ac b/configure.ac

index 05c5c9a3364f782bd2782735a3a3d6d4c7c68797..4523dbc9c7337f58560f0f93e6c1e687a295b56c 100644 (file)

--- a/configure.ac

+++ b/configure.ac

@@ -17,7 +17,8 @@

# You should have received a copy of the GNU General Public License

# along with this program. If not, see <http://www.gnu.org/licenses/>.

-AC_PREREQ([2.60])

+dnl We depend on autotest's ./testsuite -C.

+AC_PREREQ([2.61a.347])

## ------------------------ ##

## Autoconf initialization. ##

GNU M4 source repository

RSS Atom