Fix for PR automake/41:

	* automake.in (require_file_found): New global.
	(require_file_internal): Set require_file_found entry.
	(handle_texinfo): Require file any number of times.

diff --git a/ChangeLog b/ChangeLog
index 3df9473d02587dec3aa6706bbe7e0d789b719f63..027375187b61b6e53da9bac7161e70f5b827e8de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-03-19  Tom Tromey  <tromey@cygnus.com>
 
+       Fix for PR automake/41:
+       * automake.in (require_file_found): New global.
+       (require_file_internal): Set require_file_found entry.
+       (handle_texinfo): Require file any number of times.
+
        * automake.in (handle_dist_worker): Exit if `cp' fails.  Fixes
        install2.test.
 

diff --git a/automake.in b/automake.in
index cbd46f445daa6846a94b22f53791f38a801bd3b9..727685470772bcb8a6d5ec8cb6c7ba6a3a670d38 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2227,14 +2227,13 @@ sub handle_texinfo
            # actual names don't matter much.  We only number starting
            # with the second one, so that the common case looks nice.
            $vti = ($done ? $done : 'vti');
+           ++$done;
+
            &push_dist_common ($vtexi, 'stamp-' . $vti);
            push (@clean, $vti);
 
-           # Only require once.
            &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN,
-                                         'mdate-sh')
-               if ! $done;
-           ++$done;
+                                         'mdate-sh');
 
            local ($conf_pat, $conf_dir);
            if ($config_aux_dir eq '.' || $config_aux_dir eq '')
@@ -7405,6 +7404,11 @@ sub is_make_dir
 # This variable is local to the "require file" set of functions.
 @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 = ();
+
 # See if we want to push this file onto dist_common.  This function
 # encodes the rules for deciding when to do so.
 sub maybe_push_required_file
@@ -7440,6 +7444,10 @@ sub require_file_internal
 
     foreach $file (@files)
     {
+       # If we've already looked for it, we're done.
+       next if defined $require_file_found{$file};
+       $require_file_found{$file} = 1;
+
        $found_it = 0;
        foreach $dir (@require_file_paths)
        {