From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 5 Dec 2009 13:13:43 +0000 (+0100)
Subject: Do not rely on Perl symlink status, for MSYS perl.
X-Git-Tag: v1.11.1~4^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bee52debc0e96d7c09a429fc3c888bfaa32673a;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index c9709221d..496312932 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-12-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/automake.in b/automake.in
index e7f2cac5a..871c98eeb 100755
--- a/automake.in
+++ b/automake.in
@@ -7838,7 +7838,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: $!";