X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Flchown.m4;h=b567d81b43b23d6cba645530d8733db41e5e8655;hb=2f681c52f62c1bb9c9dd3fe5cd7a32ec384c34c7;hp=68398ed7a04c446c8c0e8f700dc095f840860d1f;hpb=ad605daf6131aa99227d3b85e648fa02f5387989;p=gnulib.git

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 68398ed7a..b567d81b4 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,10 +1,29 @@
-#serial 1
+# serial 15
+# Determine whether we need the lchown wrapper.
+
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2011 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(jm_FUNC_LCHOWN,
+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
+    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
 ])