automake 1.4e, 1.4g: Depcomp does not get installed

[Maciej W. Rozycki]

Hi,

 The current version of automake does not link/copy depcomp when invoked 
with the --add-missing option even if it is required by the configure
script.  The AM_DEPENDENCIES macro invokes depcomp, so I think it's
appropriate to copy the program whenever the macro is used as a part of
the configure script and not only when DEP_FILES is non-empty.

 I was able to observe the problem when building libtool 1.4 after
regenerating files with current versions of autoconf and automake.  As a
result, the shell complained of missing depcomp, even though `automake
--add-missing --copy' was invoked previously.

 A patch follows.  It was generated a few days ago but it applies to
automake 1.4g as of today cleanly.

2001-05-23  Maciej W. Rozycki  <address@hidden>

        * automake.in (seen_dependencies): New global.
        (scan_one_autoconf_file): Set it when AM_DEPENDENCIES seen.
        (handle_languages): Only check whether to include auto-dep code if
        seen_dependencies set.  Always require depcomp if the check is
        enabled.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: address@hidden, PGP key available        +

automake-20010517-1.4e-depcomp.patch
diff -up --recursive --new-file automake.macro/automake.in automake/automake.in
--- automake.macro/automake.in  Tue May 15 02:49:51 2001
+++ automake/automake.in        Mon May 21 23:25:54 2001
@@ -415,6 +415,9 @@ my $seen_multilib = 0;
 # TRUE if we've seen AM_PROG_CC_C_O
 my $seen_cc_c_o = 0;
 
+# TRUE if we've seen AM_DEPENDENCIES.
+my $seen_dependencies = 0;
+
 # TRUE if we've seen AM_INIT_AUTOMAKE.
 my $seen_init_automake = 0;
 
@@ -1447,17 +1450,17 @@ sub get_object_extension
 # Call finish function for each language that was used.
 sub handle_languages
 {
-    if ($use_dependencies)
+    if ($use_dependencies && $seen_dependencies)
     {
+       # Set location of depcomp.
+       &define_variable ('depcomp', "\$(SHELL) $config_aux_dir/depcomp");
+
+       &require_config_file ($FOREIGN, 'depcomp');
+
        # Include auto-dep code.  Don't include it if DEP_FILES would
        # be empty.
        if (&saw_sources_p (0) && keys %dep_files)
        {
-           # Set location of depcomp.
-           &define_variable ('depcomp', "\$(SHELL) $config_aux_dir/depcomp");
-
-           &require_config_file ($FOREIGN, 'depcomp');
-
            my @deplist = sort keys %dep_files;
 
            # We define this as a conditional variable because BSD
@@ -4529,6 +4532,8 @@ sub scan_one_autoconf_file
                $configure_vars{$var} = $filename . ':' . $.
              }
          }
+
+       $seen_dependencies = 1 if /AM_DEPENDENCIES/;
 
         # This macro handles several different things.
         if (/$AM_INIT_AUTOMAKE_PATTERN/o)