X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flink.m4;h=0ca85d3a8bed25fa4c2bf6133b1ba5dca59f7255;hb=6c53c9025551ed72e7011f8de83aca2639bc5bfa;hp=349d5378f504cf35a3b28dbc3f2d717d5e78523a;hpb=d1ed8a817f5d07d4013cfa0988ee2da8b2937db6;p=gnulib.git diff --git a/m4/link.m4 b/m4/link.m4 index 349d5378f..0ca85d3a8 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ -# link.m4 serial 1 -dnl Copyright (C) 2009 Free Software Foundation, Inc. +# link.m4 serial 4 +dnl Copyright (C) 2009, 2010 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. @@ -11,9 +11,28 @@ AC_DEFUN([gl_FUNC_LINK], if test $ac_cv_func_link = no; then HAVE_LINK=0 AC_LIBOBJ([link]) - gl_PREREQ_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 +]], [[if (!link ("conftest.a", "conftest.b/")) return 1; +#if HAVE_LSTAT + if (!link ("conftest.lnk/", "conftest.b")) return 2; +#endif + ]])], + [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 conftest.lnk]) + if test "$gl_cv_func_link_works" != yes; then + REPLACE_LINK=1 + AC_LIBOBJ([link]) + fi fi ]) - -# Prerequisites of lib/link.c. -AC_DEFUN([gl_PREREQ_LINK], [:])