X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Flchown.m4;h=7ce578bc3fb9c413dbc5f706fe0e5a15873eaee3;hb=b3f31eeaa29521c15f6d5523a50c3061faf4384b;hp=f64dd08202652bd67d9830046350e21733546f52;hpb=4131c37368040602add83fb12dfda11505f884e7;p=gnulib.git

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index f64dd0820..7ce578bc3 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,20 +1,28 @@
-#serial 10
+# serial 16
+# 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-2012 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_REQUIRE([gl_STAT_MACROS])
-  AC_CHECK_DECLS_ONCE([lchown])
-  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 \
+      || test "$gl_cv_func_chown_ctime_works" != yes; then
+    dnl Trailing slash and ctime bugs in chown also occur in lchown.
+    REPLACE_LCHOWN=1
+  fi
 ])