Fix for test nodepcomp.test:

	* automake.in (handle_dependencies): Require `depcomp' here.
	(scan_configure): Don't require `depcomp'.

diff --git a/ChangeLog b/ChangeLog
index 0edfdb03724e4e885f0aeaaf088bda09dad327f5..deed2e9d460329d215ca255b66c6026c2a92f018 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-19  Tom Tromey  <tromey@cygnus.com>
+
+       Fix for test nodepcomp.test:
+       * automake.in (handle_dependencies): Require `depcomp' here.
+       (scan_configure): Don't require `depcomp'.
+
 2000-03-16  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
        * automake.in (handle_configure): Remove $(BUILT_SOURCES) from

diff --git a/automake.in b/automake.in
index ebb4c8fc3f85dbb3d73156a86a0026f2d241f65b..bdd4f5a0ca2a401c688ab389374ac3e73187956e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3017,6 +3017,8 @@ sub handle_dependencies
        # be empty.
        if (&saw_sources_p (0) && keys %dep_files)
        {
+           &require_config_file ($FOREIGN, 'depcomp');
+
            # Set location of depcomp.
            if ($config_aux_dir ne '.' && $config_aux_dir ne '')
            {
@@ -4694,10 +4696,6 @@ sub scan_configure
     # the file-finding machinery works.
     local ($relative_dir) = '.';
     &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs', 'missing');
-    if ($cmdline_use_dependencies)
-    {
-       &require_config_file ($FOREIGN, 'depcomp');
-    }
     &am_error ("\`install.sh' is an anachronism; use \`install-sh' instead")
         if -f $config_aux_path[0] . '/install.sh';