r21944: move acl header checks to the correct place only

jeremy: please merge this to 3.0.25:-)

metze
(This used to be commit 874164e365b77947d5c514b2a77c6aae0f42599e)

diff --git a/source3/configure.in b/source3/configure.in
index 2f6933b6b601f7795f65ce03ef59a958eca27887..eae5fcac139e301d82a7b84190f5aaf64c29b4a1 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -918,7 +918,6 @@ AC_CHECK_HEADERS(shadow.h)
 AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h)
 AC_CHECK_HEADERS(syscall.h sys/syscall.h)
 
-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
 AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
 AC_CHECK_HEADERS(sys/ea.h sys/proplist.h)
 

diff --git a/source3/lib/replace/system/config.m4 b/source3/lib/replace/system/config.m4
index 4d66317a5ee39c242d63d77a15c148924cb05a94..74278787e7128b237aa134fa56faa435cb191ce2 100644 (file)
--- a/source3/lib/replace/system/config.m4
+++ b/source3/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)