* lib/am/configure.am: (%MAKEFILE-IN%): When appropriate, export
AUTOCONF and AUTOM4TE to proper values when calling $(AUTOMAKE).
(%MAKEFILE-IN%) [%?TOPDIR_P%]: Likewise.
($(ACLOCAL_M4)) [!%?TOPDIR_P%]: Likewise (but when calling
$(ACLOCAL).
* m4/init.m4: Bumped serial number: 16 -> 17.
(AM_INIT_AUTOMAKE): New AC_SUBSTitution `AUTOM4TE', an autom4te
program wrapped with the `missing' script. Also, AC_SUBSTitute
`am__nomissing_AUTOCONF' and `am__nomissing_AUTOM4TE', so that
they are either empty or containing *overridden* `autoconf' and
`autom4te' programs, *not* wrapped by the `missing' script.
* tests/Makefile.am (XFAIL_TESTS): Removed various now-passing
tests `remake8*.test'. Added `mising.test' and `missing2.test',
as this change breaks them (by introducing what can be seen more
as a testsuite bug, rather than an Automake one).
---
ChangeLog | 17 ++++++++++++++
Makefile.in | 39 ++++++++++++++++++++++++++++---
configure | 10 ++++++++
doc/Makefile.in | 14 ++++++++++-
lib/Automake/Makefile.in | 14 ++++++++++-
lib/Automake/tests/Makefile.in | 14 ++++++++++-
lib/Makefile.in | 14 ++++++++++-
lib/am/Makefile.in | 14 ++++++++++-
lib/am/configure.am | 49 +++++++++++++++++++++++++++++++++++-----
m4/Makefile.in | 14 ++++++++++-
m4/init.m4 | 16 +++++++++++-
tests/Makefile.am | 6 +---
tests/Makefile.in | 20 ++++++++++++----
13 files changed, 214 insertions(+), 27 deletions(-)
From c2ed91c939c6535d5918a422441caf2e4f0a4a6e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 18 Aug 2010 15:49:49 +0200
Subject: [PATCH 4/6] Improve support for non-default autotools in rebuild rules.
* lib/am/configure.am: (%MAKEFILE-IN%): When appropriate, export
AUTOCONF and AUTOM4TE to proper values when calling $(AUTOMAKE).
(%MAKEFILE-IN%) [%?TOPDIR_P%]: Likewise.
($(ACLOCAL_M4)) [!%?TOPDIR_P%]: Likewise (but when calling
$(ACLOCAL).
* m4/init.m4: Bumped serial number: 16 -> 17.
(AM_INIT_AUTOMAKE): New AC_SUBSTitution `AUTOM4TE', an autom4te
program wrapped with the `missing' script. Also, AC_SUBSTitute
`am__nomissing_AUTOCONF' and `am__nomissing_AUTOM4TE', so that
they are either empty or containing *overridden* `autoconf' and
`autom4te' programs, *not* wrapped by the `missing' script.
* tests/Makefile.am (XFAIL_TESTS): Removed various now-passing
tests `remake8*.test'. Added `mising.test' and `missing2.test',
as this change breaks them (by introducing what can be seen more
as a testsuite bug, rather than an Automake one).
---
ChangeLog | 17 ++++++++++++++
Makefile.in | 39 ++++++++++++++++++++++++++++---
configure | 10 ++++++++
doc/Makefile.in | 14 ++++++++++-
lib/Automake/Makefile.in | 14 ++++++++++-
lib/Automake/tests/Makefile.in | 14 ++++++++++-
lib/Makefile.in | 14 ++++++++++-
lib/am/Makefile.in | 14 ++++++++++-
lib/am/configure.am | 49 +++++++++++++++++++++++++++++++++++-----
m4/Makefile.in | 14 ++++++++++-
m4/init.m4 | 16 +++++++++++-
tests/Makefile.am | 6 +---
tests/Makefile.in | 20 ++++++++++++----
13 files changed, 214 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ac38d7f..3d65d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2010-08-19 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Improve support for non-default autotools in rebuild rules.
+ * lib/am/configure.am: (%MAKEFILE-IN%): When appropriate, export
+ AUTOCONF and AUTOM4TE to proper values when calling $(AUTOMAKE).
+ (%MAKEFILE-IN%) [%?TOPDIR_P%]: Likewise.
+ ($(ACLOCAL_M4)) [!%?TOPDIR_P%]: Likewise (but when calling
+ $(ACLOCAL).
+ * m4/init.m4: Bumped serial number: 16 -> 17.
+ (AM_INIT_AUTOMAKE): New AC_SUBSTitution `AUTOM4TE', an autom4te
+ program wrapped with the `missing' script. Also, AC_SUBSTitute
+ `am__nomissing_AUTOCONF' and `am__nomissing_AUTOM4TE', so that
+ they are either empty or containing *overridden* `autoconf' and
+ `autom4te' programs, *not* wrapped by the `missing' script.
+ * tests/Makefile.am (XFAIL_TESTS): Removed various now-passing
+ tests `remake8*.test'. Added `mising.test' and `missing2.test',
+ as this change breaks them (by introducing what can be seen more
+ as a testsuite bug, rather than an Automake one).
+
Add tests for non-default autotools in rebuild rules.
* configure.ac (am_AUTOM4TE): New AC_SUBST'd variable.
* tests/defs.in ($AUTOM4TE): New shell variable, defaulting
diff --git a/Makefile.in b/Makefile.in
index 0284088..56672ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,6 +150,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -196,6 +197,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -329,14 +332,32 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
+ $(am__cd) $(srcdir) && \
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu; \
+ ) && exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -354,7 +375,17 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(top_srcdir)/configure: $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ @echo ' cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)'; \
+ $(am__cd) $(srcdir) && \
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(ACLOCAL) $(ACLOCAL_AMFLAGS) )
$(am__aclocal_m4_deps):
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
diff --git a/configure b/configure
index b51f462..23ae9fe 100755
--- a/configure
+++ b/configure
@@ -584,10 +584,13 @@ INSTALL_STRIP_PROGRAM
STRIP
install_sh
MAKEINFO
+AUTOM4TE
AUTOHEADER
AUTOMAKE
AUTOCONF
ACLOCAL
+am__nomissing_AUTOM4TE
+am__nomissing_AUTOCONF
VERSION
PACKAGE
CYGPATH_W
@@ -2231,6 +2234,10 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
# Some tools Automake needs.
+test -n "$AUTOCONF" && am__nomissing_AUTOCONF=$AUTOCONF
+
+test -n "$AUTOM4TE" && am__nomissing_AUTOM4TE=$AUTOM4TE
+
ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -2244,6 +2251,9 @@ AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+AUTOM4TE=${AUTOM4TE-"${am_missing_run}autom4te"}
+
+
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6674885..13c4eb5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -117,6 +117,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -163,6 +164,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -258,7 +261,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu doc/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index a0ecee3..7c5c590 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -137,6 +137,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -183,6 +184,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -278,7 +281,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Automake/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Automake/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu lib/Automake/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 7f33269..3fdcc25 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -153,6 +153,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -199,6 +200,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -266,7 +269,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Automake/tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Automake/tests/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu lib/Automake/tests/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index edcd32f..46d7b12 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -139,6 +139,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -185,6 +186,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -249,7 +252,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu lib/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 1262c3d..c69551a 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -97,6 +97,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -143,6 +144,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -241,7 +244,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/am/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/am/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu lib/am/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/am/configure.am b/lib/am/configure.am
index e9299d6..084066c 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free
-## Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010
+## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -40,8 +40,23 @@ endif %?TOPDIR_P%
case '$(am__configure_deps)' in \
*$$dep*) \
?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS%'; \
-?TOPDIR_P? $(am__cd) $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS% \
-?TOPDIR_P? && exit 0; \
+?TOPDIR_P? $(am__cd) $(srcdir) && \
+## We must export the configure-time values of AUTOCONF and AUTOM4TE only
+## if they have been expicitly overridden by the user; otherwise, it's
+## better leave automake and aclocal pick up those values from either the
+## environment or the built-in defaults (and similarly leave autoconf pick
+## up the value of AUTOM4TE from either the environment or the built-in
+## default).
+?TOPDIR_P? ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+?TOPDIR_P? AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+?TOPDIR_P? export AUTOCONF; \
+?TOPDIR_P? fi; \
+?TOPDIR_P? if test -n '$(am__nomissing_AUTOM4TE)'; then \
+?TOPDIR_P? AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+?TOPDIR_P? export AUTOM4TE; \
+?TOPDIR_P? fi; \
+?TOPDIR_P? $(AUTOMAKE) %AUTOMAKE-OPTIONS%; \
+?TOPDIR_P? ) && exit 0; \
?!TOPDIR_P? ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
## If on the other hand, subdir/Makefile.in has been removed, then toplevel
## am--refresh will not be aware of any need to run. We still invoke it
@@ -54,7 +69,17 @@ endif %?TOPDIR_P%
## Otherwise, rebuild only this file.
echo ' cd $(top_srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS% %MAKEFILE-AM-SOURCES%'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) %AUTOMAKE-OPTIONS% %MAKEFILE-AM-SOURCES%
+## See comments above for why we need this involution.
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) %AUTOMAKE-OPTIONS% %MAKEFILE-AM-SOURCES%; \
+ )
## Ensure that GNU make doesn't remove Makefile if ./config.status (below)
## is interrupted. Otherwise, the user would need to know to rerun
@@ -119,7 +144,19 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
## the $(am__configure_deps) dependency.
if %?REGEN-ACLOCAL-M4%
$(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
-?TOPDIR_P? $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+?TOPDIR_P? @echo ' cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)'; \
+?TOPDIR_P? $(am__cd) $(srcdir) && \
+## Please see the comments above about similar code in rules for
+## rebuilding `%MAKEFILE-IN%'.
+?TOPDIR_P? ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+?TOPDIR_P? AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+?TOPDIR_P? export AUTOCONF; \
+?TOPDIR_P? fi; \
+?TOPDIR_P? if test -n '$(am__nomissing_AUTOM4TE)'; then \
+?TOPDIR_P? AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+?TOPDIR_P? export AUTOM4TE; \
+?TOPDIR_P? fi; \
+?TOPDIR_P? $(ACLOCAL) $(ACLOCAL_AMFLAGS) )
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
## Avoid the "deleted header file" problem for the dependencies.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e248cfb..4f5eb36 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -97,6 +97,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -143,6 +144,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -238,7 +241,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu m4/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu m4/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/m4/init.m4 b/m4/init.m4
index 365c9ac..9b7a777 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,13 +1,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
+# serial 17
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -70,10 +70,22 @@ _AM_IF_OPTION([no-define],,
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
+dnl We pass the the $AUTOCONF and $AUTOM4TE commands in the environment
+dnl of automake and aclocal calls in the generated Makefiles, so wrapping
+dnl them with the `missing' script would defintely be a bad idea.
+dnl For example, if aclocal proper is ever called, it will need a working
+dnl autom4te to get traces from e.g. configure.ac, and in such a case the
+dnl workarounds provided by `missing --run autom4te' are not enough; a
+dnl flat-out aclocal failure is the best and most correct option.
+test -n "$AUTOCONF" && am__nomissing_AUTOCONF=$AUTOCONF
+AC_SUBST([am__nomissing_AUTOCONF])
+test -n "$AUTOM4TE" && am__nomissing_AUTOM4TE=$AUTOM4TE
+AC_SUBST([am__nomissing_AUTOM4TE])
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(AUTOM4TE, autom4te)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a7a0ae..414d8a1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,10 +21,8 @@ all.test \
auxdir2.test \
cond17.test \
gcj6.test \
-remake8d.test \
-remake8e.test \
-remake8g.test \
-remake8h.test \
+missing.test \
+missing2.test \
txinfo5.test
include $(srcdir)/parallel-tests.am
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0b65208..74b02f5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -158,6 +158,7 @@ AMTAR = @AMTAR@
APIVERSION = @APIVERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CYGPATH_W = @CYGPATH_W@
@@ -204,6 +205,8 @@ am_AUTOCONF = @am_AUTOCONF@
am_AUTOHEADER = @am_AUTOHEADER@
am_AUTOM4TE = @am_AUTOM4TE@
am__leading_dot = @am__leading_dot@
+am__nomissing_AUTOCONF = @am__nomissing_AUTOCONF@
+am__nomissing_AUTOM4TE = @am__nomissing_AUTOM4TE@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -249,10 +252,8 @@ all.test \
auxdir2.test \
cond17.test \
gcj6.test \
-remake8d.test \
-remake8e.test \
-remake8g.test \
-remake8h.test \
+missing.test \
+missing2.test \
txinfo5.test
parallel_tests = \
@@ -1049,7 +1050,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/parallel-tests.am $(am__
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tests/Makefile
+ ( if test -n '$(am__nomissing_AUTOCONF)'; then \
+ AUTOCONF='$(am__nomissing_AUTOCONF)'; \
+ export AUTOCONF; \
+ fi; \
+ if test -n '$(am__nomissing_AUTOM4TE)'; then \
+ AUTOM4TE='$(am__nomissing_AUTOM4TE)'; \
+ export AUTOM4TE; \
+ fi; \
+ $(AUTOMAKE) --gnu tests/Makefile; \
+ )
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
--
1.7.1
