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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/Makefile.in | 21 | ||||
| -rw-r--r-- | m4/init.m4 | 2 |
2 files changed, 17 insertions, 6 deletions
diff --git a/m4/Makefile.in b/m4/Makefile.in index b47017254..7187e9625 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -14,15 +14,11 @@ @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 @@ -39,7 +35,13 @@ subdir = m4 DIST_COMMON = $(dist_m4data_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.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 @@ -71,6 +73,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@ @@ -94,6 +97,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@ @@ -105,6 +112,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@ @@ -129,8 +137,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@ m4datadir = $(datadir)/aclocal-$(APIVERSION) dist_m4data_DATA = \ $(top_srcdir)/m4/amversion.m4 \ diff --git a/m4/init.m4 b/m4/init.m4 index 28ad47339..7b0258263 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -24,7 +24,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.59a])dnl +[AC_PREREQ([2.59c])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |