X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fchown.m4;h=334f1b779e53053a492e2e597a90943a79b4fa60;hb=124beb935218646436aeb43403386a609bf1a024;hp=1fb6203e99a452e5e2e0db85c3df7ea826efcbbe;hpb=e7cf9a46ba67e8406bcdf12bc380d171bfe0e76f;p=gnulib.git

diff --git a/m4/chown.m4 b/m4/chown.m4
index 1fb6203e9..334f1b779 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,23 +1,18 @@
-#serial 2
+#serial 7
 
 dnl From Jim Meyering.
 dnl Determine whether chown accepts arguments of -1 for uid and gid.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_chown if the replacement function should be used.  */
-dnl  #undef chown
-dnl
 
-AC_DEFUN(jm_FUNC_CHOWN,
+AC_DEFUN([jm_FUNC_CHOWN],
 [AC_REQUIRE([AC_TYPE_UID_T])dnl
  test -z "$ac_cv_header_unistd_h" \
    && AC_CHECK_HEADERS(unistd.h)
  AC_CACHE_CHECK([for working chown], jm_cv_func_working_chown,
   [AC_TRY_RUN([
 #   include <sys/types.h>
-#   include <stat.h>
+#   include <sys/stat.h>
 #   include <fcntl.h>
 #   ifdef HAVE_UNISTD_H
 #    include <unistd.h>
@@ -26,7 +21,9 @@ AC_DEFUN(jm_FUNC_CHOWN,
     int
     main ()
     {
-      char *f = "conftestchown";
+      char *f = "conftest.chown";
+      struct stat before, after;
+
       if (creat (f, 0600) < 0)
         exit (1);
       if (stat (f, &before) < 0)
@@ -45,7 +42,8 @@ AC_DEFUN(jm_FUNC_CHOWN,
 	     jm_cv_func_working_chown=no)
   ])
   if test $jm_cv_func_working_chown = no; then
-    LIBOBJS="$LIBOBJS chown.o"
-    AC_DEFINE_UNQUOTED(chown, rpl_chown)
+    AC_LIBOBJ(chown)
+    AC_DEFINE_UNQUOTED(chown, rpl_chown,
+      [Define to rpl_chown if the replacement function should be used.])
   fi
 ])