X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fchown.m4;h=89761f5ff463334396f5acb2691dd76c6f2ca2f3;hb=a428fac0e9534d605382b75a647bd067b5d2e551;hp=ccdfae9926df8ceb8b50f218baa92d1c188227c2;hpb=b00e860d80d31318069eafaa67c920f24deae638;p=gnulib.git

diff --git a/m4/chown.m4 b/m4/chown.m4
index ccdfae992..89761f5ff 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,7 +1,7 @@
-#serial 13
+#serial 17
 # Determine whether we need the chown wrapper.
 
-dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
+dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007 Free
 dnl Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
@@ -16,6 +16,7 @@ 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])
@@ -29,9 +30,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
+    REPLACE_CHOWN=1
     AC_LIBOBJ(chown)
-    AC_DEFINE(chown, rpl_chown,
-      [Define to rpl_chown if the replacement function should be used.])
     gl_PREREQ_CHOWN
   fi
 ])
@@ -44,9 +44,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>
 
@@ -81,6 +79,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
 # Prerequisites of lib/chown.c.
 AC_DEFUN([gl_PREREQ_CHOWN],
 [
-  AC_CHECK_HEADERS_ONCE(unistd.h fcntl.h)
   AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
 ])