X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flchown.m4;h=646dd9f34f6a01815d59cbc2ccd0821b1b897ec2;hb=9ce199fbdfdab7ea619959741e0dba0dc5ca9146;hp=b40fe854033fc30cba3c07d8cbe392325266694a;hpb=23fe10e274cf20fb2cb75ea1da9556a733106657;p=gnulib.git

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index b40fe8540..646dd9f34 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,20 +1,29 @@
-#serial 4
+# serial 15
+# Determine whether we need the lchown wrapper.
+
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2010 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.
+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([AC_TYPE_UID_T])
-  AC_REPLACE_FUNCS(lchown)
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([gl_FUNC_CHOWN])
+  AC_CHECK_FUNCS_ONCE([lchmod])
+  AC_REPLACE_FUNCS([lchown])
   if test $ac_cv_func_lchown = no; then
-    gl_PREREQ_LCHOWN
+    HAVE_LCHOWN=0
+  elif test "$gl_cv_func_chown_slash_works" != yes \
+      || test "$gl_cv_func_chown_ctime_works" != yes; then
+    dnl Trailing slash and ctime bugs in chown also occur in lchown.
+    AC_LIBOBJ([lchown])
+    REPLACE_LCHOWN=1
   fi
 ])
-
-# Prerequisites of lib/lchown.c.
-AC_DEFUN([gl_PREREQ_LCHOWN],
-[
-  AC_REQUIRE([AC_HEADER_STAT])
-  :
-])