From 58c6ab69fa0d21de93e703bc7cf3387bd97c0b1f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 19 Mar 2000 23:13:16 +0000 Subject: [PATCH] Fix for test nodepcomp.test: * automake.in (handle_dependencies): Require `depcomp' here. (scan_configure): Don't require `depcomp'. --- ChangeLog | 6 ++++++ automake.in | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0edfdb03..deed2e9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-03-19 Tom Tromey + + Fix for test nodepcomp.test: + * automake.in (handle_dependencies): Require `depcomp' here. + (scan_configure): Don't require `depcomp'. + 2000-03-16 OKUJI Yoshinori * 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'; -- 2.43.5