* automake.in (handle_configure): Rename am__configure_deps

as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
$configure_ac.  Define am__configure_deps as am__aclocal_m4_deps
+ $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4).  Do not define
ACLOCAL_M4_DEPS while processing configure.am.
(make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
(scan_aclocal_m4): Do not distribute aclocal.m4, this
is done from lib/am/configure.am.
* lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
$(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
$(am__configure_deps) or $(am__aclocal_m4_deps).
* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.

12 files changed, 93 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index fc100f9df..e3ce68e00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2003-10-27  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (handle_configure): Rename am__configure_deps
+	as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
+	$configure_ac.  Define am__configure_deps as am__aclocal_m4_deps
+	+ $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4).  Do not define
+	ACLOCAL_M4_DEPS while processing configure.am.
+	(make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
+	(scan_aclocal_m4): Do not distribute aclocal.m4, this
+	is done from lib/am/configure.am.
+	* lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
+	$(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
+	$(am__configure_deps) or $(am__aclocal_m4_deps).
+	* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.
+
 2003-10-26  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Depend on
diff --git a/Makefile.in b/Makefile.in
index 58d84b70c..4b2e757d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,14 +37,16 @@ POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
-	Makefile.am NEWS THANKS TODO aclocal.m4 configure configure.ac
+	Makefile.am NEWS THANKS TODO configure configure.ac
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -168,9 +170,9 @@ all: all-recursive
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
@@ -194,9 +196,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
diff --git a/automake.in b/automake.in
index 71ac065e6..11bbe4fd7 100755
--- a/automake.in
+++ b/automake.in
@@ -3288,8 +3288,6 @@ sub scan_aclocal_m4 ()
 
   if (-f 'aclocal.m4')
     {
-      &push_dist_common ('aclocal.m4')
-	if $relative_dir eq '.';
       &define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL);
 
       my $aclocal = new Automake::XFile "< aclocal.m4";
@@ -3375,8 +3373,13 @@ sub handle_configure ($$$@)
   $colon_infile = '' if $colon_infile eq ":$makefile.in";
   my @rewritten = rewrite_inputs_into_dependencies ($makefile_in, @inputs);
   my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4;
+  define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
+			  @configure_deps, @aclocal_m4_deps,
+			  '$(top_srcdir)/' . $configure_ac);
+  my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
+  push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
   define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,
-			  @configure_deps);
+			  @configuredeps);
 
   $output_rules .= file_contents
     ('configure',
@@ -3392,8 +3395,7 @@ sub handle_configure ($$$@)
      'USE-DEPS'            => global_option 'no-dependencies'
                                 ? ' --ignore-deps' : '',
      'MAKEFILE-AM-SOURCES' => "$makefile$colon_infile",
-     'REGEN-ACLOCAL-M4'    => $regen_aclocal_m4,
-     ACLOCAL_M4_DEPS       => "@aclocal_m4_deps");
+     'REGEN-ACLOCAL-M4'    => $regen_aclocal_m4);
 
   if ($relative_dir eq '.')
     {
@@ -5590,7 +5592,6 @@ sub make_paragraphs ($%)
 		 'SUBDIRS'      => !! var ('SUBDIRS'),
 		 'TOPDIR'       => backname ($relative_dir),
 		 'TOPDIR_P'     => $relative_dir eq '.',
-		 'CONFIGURE-AC' => $configure_ac,
 
 		 'BUILD'    => $seen_canonical == AC_CANONICAL_SYSTEM,
 		 'HOST'     => $seen_canonical,
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ce40097f6..ba2560e1c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,12 +35,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(automake_TEXINFOS) $(srcdir)/Makefile.in Makefile.am \
 	stamp-vti version.texi
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -139,9 +141,9 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .dvi .html .info .pdf .ps .texi
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -163,9 +165,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 .texi.info:
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index b14853179..731b305db 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -36,12 +36,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = lib/Automake
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(dist_perllib_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -164,9 +166,9 @@ EXTRA_DIST = Config.in
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -188,9 +190,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 install-dist_perllibDATA: $(dist_perllib_DATA)
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index dd1352292..314fc5d75 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -35,12 +35,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = lib/Automake/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -121,9 +123,9 @@ EXTRA_DIST = $(TESTS)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -145,9 +147,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1ceec1c05..ef8aba30c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -36,12 +36,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) \
 	$(srcdir)/Makefile.in COPYING INSTALL Makefile.am ansi2knr.1 \
 	ansi2knr.c compile config.guess config.sub depcomp elisp-comp \
@@ -140,9 +142,9 @@ dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -164,9 +166,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index c446d39e8..357213cd6 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -36,12 +36,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = lib/am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(dist_am_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -126,9 +128,9 @@ texinfos.am yacc.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -150,9 +152,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 install-dist_amDATA: $(dist_am_DATA)
diff --git a/lib/am/configure.am b/lib/am/configure.am
index a274ea4be..ba7a58817 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -33,13 +33,13 @@ endif %?TOPDIR_P%
 ## --------------------- ##
 
 ## This rule remakes the Makefile.in.
-%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(am__configure_deps)
 ## If configure.ac or one of configure's dependencies has changed, all
 ## Makefile.in are to be updated; it is then more efficient to run
 ## automake on all the Makefiles at once.  It also allow Automake to be
 ## run for newly added directories.
 	@for dep in $?; do \
-	  case '$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 ?TOPDIR_P?	      echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \
 ?TOPDIR_P?	      cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \
@@ -87,14 +87,14 @@ if %?TOPDIR_P%
 ## don't exist.  This is especially important for configure, since it
 ## won't be created until autoconf is run -- which might be after
 ## automake is run.
-DIST_COMMON += $(top_srcdir)/configure %CONFIGURE-AC% $(am__configure_deps)
+DIST_COMMON += $(top_srcdir)/configure $(am__configure_deps)
 endif %?TOPDIR_P%
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 ?TOPDIR_P?	$(SHELL) ./config.status --recheck
 ?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
 ?TOPDIR_P?	cd $(srcdir) && $(AUTOCONF)
 ?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
@@ -111,7 +111,7 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCA
 ## aclocal.m4 might require adding more files to aclocal.m4.  Hence
 ## the $(am__configure_deps) dependency.
 if %?REGEN-ACLOCAL-M4%
-$(ACLOCAL_M4): %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% %ACLOCAL_M4_DEPS% $(am__configure_deps)
+$(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
 ?TOPDIR_P?	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 ?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 endif %?REGEN-ACLOCAL-M4%
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 5cf5a9573..1ae7c0f27 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -36,7 +36,7 @@
 ## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
 ## by autoheader.
 if %?FIRST_CONFIG_HIN%
-$(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps) %FILES%
+$(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES%
 	cd $(top_srcdir) && $(AUTOHEADER)
 ## Autoheader has the bad habit of not changing the time stamp if
 ## config.hin is unchanged, which breaks Make targets.  Since what
diff --git a/m4/Makefile.in b/m4/Makefile.in
index be5065b6e..9234d01e2 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -36,12 +36,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = $(dist_m4data_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -151,9 +153,9 @@ EXTRA_DIST = dirlist amversion.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -175,9 +177,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 install-dist_m4dataDATA: $(dist_m4data_DATA)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e83f67565..f7e88e2c0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -35,12 +35,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+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/options.m4 \
 	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
-	$(top_srcdir)/m4/strip.m4
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
 DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am aclocal.in \
 	automake.in defs.in
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -621,9 +623,9 @@ check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -645,9 +647,9 @@ Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 defs: $(top_builddir)/config.status defs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@