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

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index a7b357297..646dd9f34 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,19 +1,29 @@
-#serial 11
+# serial 15
+# Determine whether we need the lchown wrapper.
 
-dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006 Free Software
-dnl Foundation, Inc.
+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_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_CHOWN])
-  AC_CHECK_DECLS_ONCE([lchown])
-  AC_REPLACE_FUNCS(lchown)
+  AC_CHECK_FUNCS_ONCE([lchmod])
+  AC_REPLACE_FUNCS([lchown])
+  if test $ac_cv_func_lchown = no; then
+    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
 ])