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 deed2e9d460329d215ca255b66c6026c2a92f018..7d5825cbcf5bab8343bedf61b7471c3cdb726f8d 100644 (file)
--- 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 bdd4f5a0ca2a401c688ab389374ac3e73187956e..642f60b3122e9ecc731be26405fff1624e2b288f 100755 (executable)
--- 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);
                }