summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-03-23 10:30:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:51 -0500
commit6685e533854fe603043e219a4a91fbf779cde1dd (patch)
treeffe076fb6e4f94a28b08f9862012741e6ad708e0
parentbf26a7632e438199ab10c9557f7d018e19705604 (diff)
downloadsamba-6685e533854fe603043e219a4a91fbf779cde1dd.tar.gz
samba-6685e533854fe603043e219a4a91fbf779cde1dd.tar.bz2
samba-6685e533854fe603043e219a4a91fbf779cde1dd.zip
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)
-rw-r--r--source3/configure.in1
-rw-r--r--source3/lib/replace/system/config.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 2f6933b6b6..eae5fcac13 100644
--- 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 4d66317a5e..74278787e7 100644
--- 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)