From: Tom Tromey <tromey@redhat.com>
Date: Sun, 19 Mar 2000 23:13:16 +0000 (+0000)
Subject: 	Fix for test nodepcomp.test:
X-Git-Tag: Release-1-4b~106
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=58c6ab69fa0d21de93e703bc7cf3387bd97c0b1f;p=automake.git

	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 0edfdb03..deed2e9d 100644
--- 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 ebb4c8fc..bdd4f5a0 100755
--- 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';