From 2b5b994480d6f4038683424d061dcaac6d244bf3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 19 Mar 2000 23:33:42 +0000 Subject: [PATCH] Fix for test nodepcomp.test: * automake.in (require_file_internal): Use readlink on symlinks. Only unlink file if we are going to try to add it again. (handle_dependencies): Require `depcomp' here. (scan_configure): Don't require `depcomp'. --- ChangeLog | 4 +++- automake.in | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index deed2e9d..7d5825cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ 2000-03-19 Tom Tromey Fix for test nodepcomp.test: - * automake.in (handle_dependencies): Require `depcomp' here. + * automake.in (require_file_internal): Use readlink on symlinks. + Only unlink file if we are going to try to add it again. + (handle_dependencies): Require `depcomp' here. (scan_configure): Don't require `depcomp'. 2000-03-16 OKUJI Yoshinori diff --git a/automake.in b/automake.in index bdd4f5a0..642f60b3 100755 --- a/automake.in +++ b/automake.in @@ -7462,7 +7462,7 @@ sub require_file_internal # config_aux_path. $errfile = $errdir . '/' . $file; - if (-l $fullfile && ! -f _) + if (-l $fullfile && ! -f readlink ($fullfile)) { $dangling_sym = 1; last; @@ -7485,7 +7485,7 @@ sub require_file_internal { if ($strictness >= $mystrict) { - if ($dangling_sym || $force_missing) + if ($dangling_sym && ($force_missing || $add_missing)) { unlink ($fullfile); } -- 2.43.5