diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-06-30 11:07:41 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-06-30 11:07:41 +0000 |
| commit | c01e9982c1591b40f0072794842012fd7be2808f (patch) | |
| tree | ff849f8fb687daafaf8a9813fbfdd3f4e03966d7 /tests | |
| parent | 2d3e84e539ad9333eb48a5197b37be1d9b6029b7 (diff) | |
| download | automake-c01e9982c1591b40f0072794842012fd7be2808f.tar.gz | |
* automake.in (scan_autoconf_traces): Scan AC_SUBST_TRACE instead
of AC_SUBST.
* lib/am/header-vars.am (srcdir, top_srcdir, top_builddir, INSTALL):
Do not define, they are AC_SUBST_TRACEd by Autoconf.
* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.59c.
* tests/include.test: Call AC_OUTPUT.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.in | 21 | ||||
| -rwxr-xr-x | tests/include.test | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 130c4a95a..11c0674ab 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -38,7 +34,13 @@ subdir = tests DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/aclocal.in $(srcdir)/automake.in $(srcdir)/defs.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ + $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs @@ -61,6 +63,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ FGREP = @FGREP@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -84,6 +87,10 @@ SHELL = @SHELL@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_STRIP = @ac_ct_STRIP@ am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ @@ -95,6 +102,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -119,8 +127,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test TESTS = \ aclibobj.test \ diff --git a/tests/include.test b/tests/include.test index e550891ed..773a2c392 100755 --- a/tests/include.test +++ b/tests/include.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -23,6 +23,8 @@ . ./defs || exit 1 +echo AC_OUTPUT >> configure.in + cat > Makefile.am << 'END' include foo END |