1999-01-06 Gary V. Vaughan <garyv@oranda.demon.co.uk>

	* automake.in (require_file_internal): qub perl on win32 hangs
	on a call to unlink for a non-existant file, which in turn causes
	tests/symlink.test to hang on win32.  Check that the file exists
	before unlinking it!

diff --git a/ChangeLog b/ChangeLog
index efc8f953af49f4de2eb7306dbd498038f327ceb3..d0a0a4f67fb015f57d2f15bfd4d3c3d3a1439f61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-06  Gary V. Vaughan  <garyv@oranda.demon.co.uk>
+
+       * automake.in (require_file_internal): qub perl on win32 hangs
+       on a call to unlink for a non-existant file, which in turn causes
+       tests/symlink.test to hang on win32.  Check that the file exists
+       before unlinking it!
+
 1998-12-24  Thomas Tanner  <tanner@gmx.de>
 
        * automake.in (handle_ltlibraries): check whether -module was

diff --git a/automake.in b/automake.in
index d4dc354ed2392594d746c2d48681cdb1cf78e1ba..d50e1bc669680c940392dce99e12342d2f0b004d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6782,7 +6782,9 @@ sub require_file_internal
                        # can, copy if we must.  Note: delete the file
                        # first, in case it is a dangling symlink.
                        $message = "installing \`$errfile'";
-                       unlink ($errfile);
+                       # Windows Perl will hang if we try to delete a
+                       # file that doesn't exist.
+                       unlink ($errfile) if -f $errfile;
                        if ($symlink_exists && ! $copy_missing)
                        {
                            if (! symlink ($am_dir . '/' . $file, $errfile))