From b646a237da67a822f6f8ca9d17da0ad340b26f0c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 12:59:37 +0200
Subject: [PATCH] lchown: Move AC_LIBOBJ invocations to module description.

* m4/lchown.m4 (gl_FUNC_EUIDACCESS): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ invocations from here...
* modules/lchown (configure.ac): ... to here.
---
 ChangeLog      | 7 +++++++
 m4/lchown.m4   | 5 ++---
 modules/lchown | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ffaa7cb0a..263c496c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	lchown: Move AC_LIBOBJ invocations to module description.
+	* m4/lchown.m4 (gl_FUNC_EUIDACCESS): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ invocations from here...
+	* modules/lchown (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	iswctype: Move AC_LIBOBJ invocations to module description.
 	* m4/iswctype.m4 (gl_FUNC_ISWCTYPE): Move AC_LIBOBJ invocation from
 	here...
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index b567d81b4..21ac47f18 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,4 +1,4 @@
-# serial 15
+# serial 16
 # Determine whether we need the lchown wrapper.
 
 dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2011 Free Software Foundation,
@@ -17,13 +17,12 @@ AC_DEFUN([gl_FUNC_LCHOWN],
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_CHOWN])
   AC_CHECK_FUNCS_ONCE([lchmod])
-  AC_REPLACE_FUNCS([lchown])
+  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.
-    AC_LIBOBJ([lchown])
     REPLACE_LCHOWN=1
   fi
 ])
diff --git a/modules/lchown b/modules/lchown
index d9d140e3c..1ddecca4c 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -15,6 +15,9 @@ sys_stat        [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 
 configure.ac:
 gl_FUNC_LCHOWN
+if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then
+  AC_LIBOBJ([lchown])
+fi
 gl_UNISTD_MODULE_INDICATOR([lchown])
 
 Makefile.am:
-- 
2.11.0