projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
count-one-bits: relax license
[gnulib.git]
/
m4
/
chown.m4
diff --git
a/m4/chown.m4
b/m4/chown.m4
index
ccdfae9
..
89761f5
100644
(file)
--- a/
m4/chown.m4
+++ b/
m4/chown.m4
@@
-1,7
+1,7
@@
-#serial 1
3
+#serial 1
7
# Determine whether we need the chown wrapper.
# 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
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_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_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
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_LIBOBJ(chown)
- AC_DEFINE(chown, rpl_chown,
- [Define to rpl_chown if the replacement function should be used.])
gl_PREREQ_CHOWN
fi
])
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([[
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>
#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],
[
# 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)])
])
AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
])