X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fchown.m4;h=ac76d3fe2bc517b0a2b94bb6e5da8d710b437e3a;hb=16685f16dd4a1a691ae6807eeb12f7c586669003;hp=39f6bb6a3c7b34f883370f516a4bd932aba44312;hpb=e74d04a8682cb37afd40f7f7d55580e3e97b48ce;p=gnulib.git

diff --git a/m4/chown.m4 b/m4/chown.m4
index 39f6bb6a3..ac76d3fe2 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,8 +1,8 @@
-#serial 14
+# serial 19
 # Determine whether we need the chown wrapper.
 
-dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
-dnl Software Foundation, Inc.
+dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009
+dnl Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,12 +16,14 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_CHOWN],
 [
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_TYPE_UID_T])
   AC_REQUIRE([AC_FUNC_CHOWN])
   AC_REQUIRE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK])
+  AC_CHECK_FUNCS_ONCE([chown])
 
   if test $ac_cv_func_chown_works = no; then
-    AC_DEFINE(CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE, 1,
+    AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1],
       [Define if chown is not POSIX compliant regarding IDs of -1.])
   fi
 
@@ -29,9 +31,8 @@ AC_DEFUN([gl_FUNC_CHOWN],
   if test $ac_cv_func_chown_works$gl_cv_func_chown_follows_symlink = yesyes; then
     : # no wrapper needed
   else
-    AC_LIBOBJ(chown)
-    AC_DEFINE(chown, rpl_chown,
-      [Define to rpl_chown if the replacement function should be used.])
+    REPLACE_CHOWN=1
+    AC_LIBOBJ([chown])
     gl_PREREQ_CHOWN
   fi
 ])
@@ -44,9 +45,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
     gl_cv_func_chown_follows_symlink,
     [
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 
@@ -73,7 +72,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
   )
 
   if test $gl_cv_func_chown_follows_symlink = no; then
-    AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1,
+    AC_DEFINE([CHOWN_MODIFIES_SYMLINK], [1],
       [Define if chown modifies symlinks.])
   fi
 ])
@@ -81,6 +80,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
 # Prerequisites of lib/chown.c.
 AC_DEFUN([gl_PREREQ_CHOWN],
 [
-  AC_CHECK_HEADERS_ONCE(unistd.h)
-  AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
+  AC_CHECK_FUNC([fchown], , [AC_LIBOBJ([fchown-stub])])
 ])