r22217: merge from samba3 21944:

move acl header checks to the correct place only

metze

diff --git a/source/lib/replace/system/config.m4 b/source/lib/replace/system/config.m4
index 4d66317a5ee39c242d63d77a15c148924cb05a94..74278787e7128b237aa134fa56faa435cb191ce2 100644 (file)
--- a/source/lib/replace/system/config.m4
+++ b/source/lib/replace/system/config.m4
@@ -1,6 +1,7 @@
 # filesys
 AC_HEADER_DIRENT 
-AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/acl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h )
+AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
 
 # select
 AC_CHECK_HEADERS(sys/select.h)

diff --git a/source/lib/replace/system/filesys.h b/source/lib/replace/system/filesys.h
index 1e48f7ab40408a25a7fef509b56f33e5bbd6ceaa..3b68abe48aeda7d94c37a8382f041f9512c59a08 100644 (file)
--- a/source/lib/replace/system/filesys.h
+++ b/source/lib/replace/system/filesys.h
@@ -41,6 +41,10 @@
 #include <sys/acl.h>
 #endif
 
+#ifdef HAVE_ACL_LIBACL_H
+#include <acl/libacl.h>
+#endif
+
 #ifdef HAVE_SYS_FS_S5PARAM_H 
 #include <sys/fs/s5param.h>
 #endif