X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flchown.m4;h=743ed5b0c3f1a145be71d5590da9ac1706f6f33d;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=e40c4376262f7ae8509415cf1b03986436de01a5;hpb=6bd102382341d268d2e99349abd4c21546a5993e;p=gnulib.git

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index e40c43762..743ed5b0c 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,27 +1,38 @@
-# serial 14
+# serial 17
 # Determine whether we need the lchown wrapper.
 
-dnl Copyright (C) 1998, 2001, 2003-2007, 2009 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2014 Free Software Foundation,
+dnl 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.
 
 dnl From Jim Meyering.
-dnl Provide lchown on systems that lack it, and work around trailing
-dnl slash bugs on systems that have it.
+dnl Provide lchown on systems that lack it, and work around bugs
+dnl on systems that have it.
 
 AC_DEFUN([gl_FUNC_LCHOWN],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_CHOWN])
-  AC_REPLACE_FUNCS([lchown])
+  AC_CHECK_FUNCS_ONCE([lchmod])
+  AC_CHECK_FUNCS([lchown])
   if test $ac_cv_func_lchown = no; then
     HAVE_LCHOWN=0
-  elif test "$gl_cv_func_chown_slash_works" != yes; then
-    dnl Trailing slash bugs in chown also occur in lchown.
-    AC_LIBOBJ([lchown])
-    REPLACE_LCHOWN=1
+  else
+    dnl Trailing slash and ctime bugs in chown also occur in lchown.
+    case "$gl_cv_func_chown_slash_works" in
+      *yes) ;;
+      *)
+        REPLACE_LCHOWN=1
+        ;;
+    esac
+    case "$gl_cv_func_chown_ctime_works" in
+      *yes) ;;
+      *)
+        REPLACE_LCHOWN=1
+        ;;
+    esac
   fi
 ])