Do not rely on Perl symlink status, for MSYS perl.

* automake.in (require_file_internal): Ensure presence of
symlink target file; MSYS perl symlink doesn't return an error
status when the file could not be created (copied, on this
system).  Fixes symlink.test failure.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b459017e3..7abed38c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Do not rely on Perl symlink status, for MSYS perl.
+	* automake.in (require_file_internal): Ensure presence of
+	symlink target file; MSYS perl symlink doesn't return an error
+	status when the file could not be created (copied, on this
+	system).  Fixes symlink.test failure.
+
 2009-11-29  Karl Berry  <karl@freefriends.org>
 
 	Rewrite `gnupload --help' examples.
diff --git a/automake.in b/automake.in
index a0d4eed2c..41837d661 100755
--- a/automake.in
+++ b/automake.in
@@ -7225,7 +7225,8 @@ sub require_file_internal ($$$@)
 		      unlink ($fullfile) if -f $fullfile;
 		      if ($symlink_exists && ! $copy_missing)
 			{
-			  if (! symlink ("$libdir/$file", $fullfile))
+			  if (! symlink ("$libdir/$file", $fullfile)
+			      || ! -e $fullfile)
 			    {
 			      $suppress = 0;
 			      $trailer = "; error while making link: $!";