X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flink.m4;h=2f1a439ede0a728e25d5907622e593ce5d7c9413;hb=6c7676917dc405c3db23d307137da507511a6847;hp=a212ee26605eb8878f9e18e51f97b893b1b5ba94;hpb=8bfee8687b37d280d51793774be0fa79070eafa1;p=gnulib.git

diff --git a/m4/link.m4 b/m4/link.m4
index a212ee266..2f1a439ed 100644
--- a/m4/link.m4
+++ b/m4/link.m4
@@ -1,5 +1,5 @@
-# link.m4 serial 3
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
+# link.m4 serial 6
+dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,21 +10,32 @@ AC_DEFUN([gl_FUNC_LINK],
   AC_CHECK_FUNCS_ONCE([link])
   if test $ac_cv_func_link = no; then
     HAVE_LINK=0
-    AC_LIBOBJ([link])
   else
     AC_CACHE_CHECK([whether link handles trailing slash correctly],
       [gl_cv_func_link_works],
       [touch conftest.a
+       # Assume that if we have lstat, we can also check symlinks.
+       if test $ac_cv_func_lstat = yes; then
+         ln -s conftest.a conftest.lnk
+       fi
        AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
            [[#include <unistd.h>
-]], [[return !link ("conftest.a", "conftest.b/");]])],
+           ]],
+           [[int result = 0;
+             if (!link ("conftest.a", "conftest.b/"))
+               result |= 1;
+#if HAVE_LSTAT
+             if (!link ("conftest.lnk/", "conftest.b"))
+               result |= 2;
+#endif
+             return result;
+           ]])],
          [gl_cv_func_link_works=yes], [gl_cv_func_link_works=no],
          [gl_cv_func_link_works="guessing no"])
-       rm -f conftest.a conftest.b])
+       rm -f conftest.a conftest.b conftest.lnk])
     if test "$gl_cv_func_link_works" != yes; then
       REPLACE_LINK=1
-      AC_LIBOBJ([link])
     fi
   fi
 ])