From: Bruno Haible <bruno@clisp.org>
Date: Fri, 6 May 2011 01:27:03 +0000 (+0200)
Subject: chown: Respect rules for use of AC_LIBOBJ.
X-Git-Tag: v0.1~2595
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b67e585b3818d0c08d23a574cab48dd41cbdc82a;p=gnulib.git

chown: Respect rules for use of AC_LIBOBJ.

* m4/chown.m4 (gl_FUNC_CHOWN): Move AC_LIBOBJ invocations from here...
* modules/chown (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index d8295ff78..8aa527e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
+	chown: Respect rules for use of AC_LIBOBJ.
+	* m4/chown.m4 (gl_FUNC_CHOWN): Move AC_LIBOBJ invocations from here...
+	* modules/chown (configure.ac): ... to here.
+
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
 	chdir-long: Move AC_LIBOBJ invocations to module description.
 	* m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG): Move AC_LIBOBJ and
 	gl_PREREQ_CHDIR_LONG invocations from here...
diff --git a/m4/chown.m4 b/m4/chown.m4
index f664e7c57..fa46981b2 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,4 +1,4 @@
-# serial 24
+# serial 25
 # Determine whether we need the chown wrapper.
 
 dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2011 Free Software
@@ -25,12 +25,10 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
   dnl mingw lacks chown altogether.
   if test $ac_cv_func_chown = no; then
     HAVE_CHOWN=0
-    AC_LIBOBJ([chown])
   else
     dnl Some old systems treated chown like lchown.
     if test $gl_cv_func_chown_follows_symlink = no; then
       REPLACE_CHOWN=1
-      AC_LIBOBJ([chown])
     fi
 
     dnl Some old systems tried to use uid/gid -1 literally.
@@ -38,7 +36,6 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
       AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1],
         [Define if chown is not POSIX compliant regarding IDs of -1.])
       REPLACE_CHOWN=1
-      AC_LIBOBJ([chown])
     fi
 
     dnl Solaris 9 ignores trailing slash.
@@ -62,7 +59,6 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
       AC_DEFINE([CHOWN_TRAILING_SLASH_BUG], [1],
         [Define to 1 if chown mishandles trailing slash.])
       REPLACE_CHOWN=1
-      AC_LIBOBJ([chown])
     fi
 
     dnl OpenBSD fails to update ctime if ownership does not change.
@@ -90,11 +86,6 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
       AC_DEFINE([CHOWN_CHANGE_TIME_BUG], [1], [Define to 1 if chown fails
         to change ctime when at least one argument was not -1.])
       REPLACE_CHOWN=1
-      AC_LIBOBJ([chown])
-    fi
-
-    if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then
-      AC_LIBOBJ([fchown-stub])
     fi
   fi
 ])
diff --git a/modules/chown b/modules/chown
index ccfeb3bcd..1c271f054 100644
--- a/modules/chown
+++ b/modules/chown
@@ -15,6 +15,12 @@ sys_stat        [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 
 configure.ac:
 gl_FUNC_CHOWN
+if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then
+  AC_LIBOBJ([chown])
+fi
+if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then
+  AC_LIBOBJ([fchown-stub])
+fi
 gl_UNISTD_MODULE_INDICATOR([chown])
 
 Makefile.am: