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 c9709221d6fd99753c00b7d7f2f8ce41776adc19..496312932b4a02258c3937a748700cb5b60b9f18 100644 (file)
--- 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 e7f2cac5a5e998e08d17c3120f4c0b1f6538e88f..871c98eeb778e18ae9c0ab7e5d8cadcb0c892c50 100755 (executable)
--- 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: $!";