From: Tom Tromey <tromey@redhat.com>
Date: Sun, 19 Mar 2000 23:33:42 +0000 (+0000)
Subject: 	Fix for test nodepcomp.test:
X-Git-Tag: Release-1-4b~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5f19447257ea19a42be037dd5ab4965d7f603a2;p=thirdparty%2Fautomake.git

	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'.
---

diff --git a/ChangeLog b/ChangeLog
index deed2e9d4..7d5825cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2000-03-19  Tom Tromey  <tromey@cygnus.com>
 
 	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  <okuji@kuicr.kyoto-u.ac.jp>
diff --git a/automake.in b/automake.in
index bdd4f5a0c..642f60b31 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);
 		}