From 6262602b4ff1aff61103069b03b707fb66334555 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 15 Apr 2007 16:30:01 +0000 Subject: r22217: merge from samba3 21944: move acl header checks to the correct place only metze (This used to be commit be84eb68e1f0d3826b9f819fa44d8b399e38cbcd) --- source4/lib/replace/system/config.m4 | 3 ++- source4/lib/replace/system/filesys.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/lib/replace') diff --git a/source4/lib/replace/system/config.m4 b/source4/lib/replace/system/config.m4 index 4d66317a5e..74278787e7 100644 --- a/source4/lib/replace/system/config.m4 +++ b/source4/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/source4/lib/replace/system/filesys.h b/source4/lib/replace/system/filesys.h index 1e48f7ab40..3b68abe48a 100644 --- a/source4/lib/replace/system/filesys.h +++ b/source4/lib/replace/system/filesys.h @@ -41,6 +41,10 @@ #include #endif +#ifdef HAVE_ACL_LIBACL_H +#include +#endif + #ifdef HAVE_SYS_FS_S5PARAM_H #include #endif -- cgit