* automake.in (initialize_per_input): Clear %require_file_found.

(%require_file_found): Group the declaration with the other
variables initialized by initialize_per_input.
* tests/required.test: New file.
* tests/Makefile.am (TESTS): Add it.
Reported by Marius Vollmer.

diff --git a/ChangeLog b/ChangeLog
index 8b62d4989ebb6320a2bff3b2e1acc3c45d1cab6b..ca592b8559c9c3f42dbf34bf91863ecb7f3bdcd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-19  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (initialize_per_input): Clear %require_file_found.
+       (%require_file_found): Group the declaration with the other
+       variables initialized by initialize_per_input.
+       * tests/required.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Reported by Marius Vollmer.
+
 2002-04-19  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): New function,

diff --git a/automake.in b/automake.in
index dccbbcd2a8a6a00c8ae3ee2c25f708a39e90030d..86bd18977c2d7d3709b20897474c24e0b3bb5fb6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -604,6 +604,12 @@ my @substtos;
 # variables.
 my %substnums = ();
 
+# If a file name appears as a key in this hash, then it has already
+# been checked for.  This variable is local to the "require file"
+# functions.
+my %require_file_found = ();
+
+
 ## --------------------------------- ##
 ## Forward subroutine declarations.  ##
 ## --------------------------------- ##
@@ -738,6 +744,8 @@ sub initialize_per_input ()
 
     # We always include `.'.  This isn't strictly correct.
     %libtool_clean_directories = ('.' => 1);
+
+    %require_file_found = ();
 }
 
 
@@ -985,9 +993,6 @@ while ($automake_needs_to_reprocess_all_files);
 
 exit $exit_status;
 
-# FIXME: This should be `my'ed next to its subs.
-use vars '%require_file_found';
-
 ################################################################
 
 # prog_error (@PRINT-ME)
@@ -7587,11 +7592,6 @@ sub is_make_dir
 # This variable is local to the "require file" set of functions.
 my @require_file_paths = ();
 
-# If a file name appears as a key in this hash, then it has already
-# been checked for.  This variable is local to the "require file"
-# functions.
-%require_file_found = ();
-
 
 # &maybe_push_required_file ($DIR, $FILE, $FULLFILE)
 # --------------------------------------------------

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 411bb3a8facb8bdb37b6a462cc8ee8a584bffe23..985004c96bee5fab0a0e99c91815733bc49593e2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -281,6 +281,7 @@ remake.test \
 remake2.test \
 remake3.test \
 req.test \
+required.test \
 rulepat.test \
 scripts.test \
 seenc.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2cb29ef3fb78ef0a4c259f4384e2d1a60b356791..93d1f61e8e41caa85818a19bcb9d390682456721 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -365,6 +365,7 @@ remake.test \
 remake2.test \
 remake3.test \
 req.test \
+required.test \
 rulepat.test \
 scripts.test \
 seenc.test \

diff --git a/tests/required.test b/tests/required.test
new file mode 100755 (executable)
index 0000000..3c65adb
--- /dev/null
+++ b/tests/required.test
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+# Make sure Automake will install several copies of required files if needed.
+# Reported by Marius Vollmer.
+
+. $srcdir/defs || exit 1
+
+set -e
+
+cat >> configure.in <<EOF
+AC_CONFIG_FILES([one/Makefile two/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir one
+mkdir two
+
+echo 'SUBDIRS = one two' > Makefile.am
+echo 'info_TEXINFOS = mumble.texi' > one/Makefile.am
+cat >one/mumble.texi <<'END'
+@setfilename mumble.info
+@include version.texi
+END
+
+cp one/Makefile.am one/mumble.texi two
+
+$ACLOCAL
+$AUTOMAKE --add-missing --copy
+
+test -f one/mdate-sh
+test -f one/texinfo.tex
+test -f two/mdate-sh
+test -f two/texinfo.tex