diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-10-22 16:24:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-10-22 16:24:32 +0200 |
| commit | 35428fb6b2d269dbfa2eec7d0739aec149bd4cc2 (patch) | |
| tree | 03146c5871ad9b2167f3dffc89fdbb3082d7fc4e /m4/rename.m4 | |
| parent | fe4ea6859e7d19a0fe2694a3fb49f4abb722afc1 (diff) | |
| download | guile-35428fb6b2d269dbfa2eec7d0739aec149bd4cc2.tar.gz | |
Update Gnulib to v0.0-6523-gb3609c1.
Diffstat (limited to 'm4/rename.m4')
| -rw-r--r-- | m4/rename.m4 | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/m4/rename.m4 b/m4/rename.m4 index c938b0d00..af8d584e9 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,4 +1,4 @@ -# serial 24 +# serial 25 # Copyright (C) 2001, 2003, 2005-2006, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -110,37 +110,42 @@ AC_DEFUN([gl_FUNC_RENAME], dnl NetBSD 1.6 and cygwin 1.5.x mistakenly reduce hard link count dnl on rename("h1","h2"). dnl This bug requires stat'ting targets prior to attempting rename. + AC_CHECK_FUNCS_ONCE([link]) AC_CACHE_CHECK([whether rename manages hard links correctly], [gl_cv_func_rename_link_works], - [rm -rf conftest.f conftest.f1 - if touch conftest.f && ln conftest.f conftest.f1 && - set x `ls -i conftest.f conftest.f1` && test "$2" = "$4"; then - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ -# include <stdio.h> -# include <stdlib.h> -# include <unistd.h> - ]], - [[int result = 0; - if (rename ("conftest.f", "conftest.f1")) - result |= 1; - if (unlink ("conftest.f1")) - result |= 2; - if (rename ("conftest.f", "conftest.f")) - result |= 4; - if (rename ("conftest.f1", "conftest.f1") == 0) - result |= 8; - return result; - ]])], - [gl_cv_func_rename_link_works=yes], - [gl_cv_func_rename_link_works=no], - dnl When crosscompiling, assume rename is broken. - [gl_cv_func_rename_link_works="guessing no"]) - else - gl_cv_func_rename_link_works="guessing no" - fi - rm -rf conftest.f conftest.f1 - ]) + [if test $ac_cv_func_link = yes; then + rm -rf conftest.f conftest.f1 + if touch conftest.f && ln conftest.f conftest.f1 && + set x `ls -i conftest.f conftest.f1` && test "$2" = "$4"; then + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +# include <stdio.h> +# include <stdlib.h> +# include <unistd.h> + ]], + [[int result = 0; + if (rename ("conftest.f", "conftest.f1")) + result |= 1; + if (unlink ("conftest.f1")) + result |= 2; + if (rename ("conftest.f", "conftest.f")) + result |= 4; + if (rename ("conftest.f1", "conftest.f1") == 0) + result |= 8; + return result; + ]])], + [gl_cv_func_rename_link_works=yes], + [gl_cv_func_rename_link_works=no], + dnl When crosscompiling, assume rename is broken. + [gl_cv_func_rename_link_works="guessing no"]) + else + gl_cv_func_rename_link_works="guessing no" + fi + rm -rf conftest.f conftest.f1 + else + gl_cv_func_rename_link_works=yes + fi + ]) if test "x$gl_cv_func_rename_link_works" != xyes; then REPLACE_RENAME=1 AC_DEFINE([RENAME_HARD_LINK_BUG], [1], |