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,
override AC_CONFIG_HEADERS with AM_CONFIG_HEADER.
(_AM_CONFIG_HEADER): Use _AM_AC_CONFIG_HEADERS.
# 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. ##
## --------------------------------- ##
# We always include `.'. This isn't strictly correct.
%libtool_clean_directories = ('.' => 1);
+
+ %require_file_found = ();
}
exit $exit_status;
-# FIXME: This should be `my'ed next to its subs.
-use vars '%require_file_found';
-
################################################################
# prog_error (@PRINT-ME)
# 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)
# --------------------------------------------------
remake2.test \
remake3.test \
req.test \
+required.test \
rulepat.test \
scripts.test \
seenc.test \
remake2.test \
remake3.test \
req.test \
+required.test \
rulepat.test \
scripts.test \
seenc.test \
--- /dev/null
+#! /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