[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 08ed00124d8b6b445d3b91a9aa15eec638b02f05

[Clint Adams]

The following commit has been merged in the upstream branch:
commit c163b74f03d01f8ef023ad915ab5520fba909fe0
Author: Clint Adams <schizo at debian.org>
Date:   Sat Jan 5 19:40:27 2008 +0000

    Don't check for acl functions; we don't want to link to libacl.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-157

diff --git a/configure.ac b/configure.ac
index 313b7e2..698686c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
   ])
 done
 
-AC_CHECK_FUNCS(fchmodat fchownat fstatat mkdirat mknodat openat renameat unlinkat acl_set_fd acl_set_file)
+AC_CHECK_FUNCS(fchmodat fchownat fstatat mkdirat mknodat openat renameat unlinkat)
 
 dnl find out how stat() etc are called. On linux systems, we really
 dnl need to wrap (IIRC):
diff --git a/libfakeroot.c b/libfakeroot.c
index 728fd4c..9323d48 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -1466,16 +1466,14 @@ int fakeroot_isdisabled(void)
   return fakeroot_disabled;
 }
 
-#ifdef HAVE_ACL_SET_FD
+#ifdef HAVE_SYS_ACL_H
 int acl_set_fd(int fd, acl_t acl) {
   errno = ENOTSUP;
   return -1;
 }
-#endif /* HAVE_ACL_SET_FD */
 
-#ifdef HAVE_ACL_SET_FILE
 int acl_set_file(const char *path_p, acl_type_t type, acl_t acl) {
   errno = ENOTSUP;
   return -1;
 }
-#endif /* HAVE_ACL_SET_FILE */
+#endif /* HAVE_SYS_ACL_H */
diff --git a/wrapfunc.inp b/wrapfunc.inp
index d0d505f..247fb25 100644
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -123,9 +123,7 @@ unlinkat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, fl
 #endif /* HAVE_UNLINKAT */
 #endif /* HAVE_FSTATAT */
 
-#ifdef HAVE_ACL_SET_FD
+#ifdef HAVE_SYS_ACL_H
 acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
-#endif /* HAVE_ACL_SET_FD */
-#ifdef HAVE_ACL_SET_FILE
 acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)
-#endif /* HAVE_ACL_SET_FILE */
+#endif /* HAVE_SYS_ACL_H */

-- 
fakeroot