I'm installing this on HEAD.
2005-06-30 Alexandre Duret-Lutz <[EMAIL PROTECTED]>
* 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.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1605
diff -u -r1.1605 automake.in
--- automake.in 22 Jun 2005 15:07:26 -0000 1.1605
+++ automake.in 30 Jun 2005 11:02:39 -0000
@@ -4762,7 +4762,7 @@
AC_INIT => 0,
AC_LIBSOURCE => 1,
AC_REQUIRE_AUX_FILE => 1,
- AC_SUBST => 1,
+ AC_SUBST_TRACE => 1,
AM_AUTOMAKE_VERSION => 1,
AM_CONDITIONAL => 2,
AM_ENABLE_MULTILIB => 0,
@@ -4881,9 +4881,9 @@
{
$libsources{$args[1]} = $here;
}
- elsif ($macro eq 'AC_SUBST')
+ elsif ($macro eq 'AC_SUBST_TRACE')
{
- # Just check for alphanumeric in AC_SUBST. If you do
+ # Just check for alphanumeric in AC_SUBST_TRACE. If you do
# AC_SUBST(5), then too bad.
$configure_vars{$args[1]} = $where
if $args[1] =~ /^\w+$/;
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.61
diff -u -r1.61 init.m4
--- m4/init.m4 9 Jan 2005 14:46:21 -0000 1.61
+++ m4/init.m4 30 Jun 2005 11:02:41 -0000
@@ -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
Index: lib/am/header-vars.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/header-vars.am,v
retrieving revision 1.49
diff -u -r1.49 header-vars.am
--- lib/am/header-vars.am 14 May 2005 20:28:53 -0000 1.49
+++ lib/am/header-vars.am 30 Jun 2005 11:02:41 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2005
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,6 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
@SET_MAKE@
@@ -36,11 +34,7 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-## Location of top build directory relative to this one.
-top_builddir = %TOPDIR%
-
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
Index: tests/include.test
===================================================================
RCS file: /cvs/automake/automake/tests/include.test,v
retrieving revision 1.6
diff -u -r1.6 include.test
--- tests/include.test 14 May 2005 20:28:55 -0000 1.6
+++ tests/include.test 30 Jun 2005 11:02:41 -0000
@@ -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
--
Alexandre Duret-Lutz
