diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-04-15 16:30:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:50:39 -0500 |
| commit | 6262602b4ff1aff61103069b03b707fb66334555 (patch) | |
| tree | 11059992d56e95e04129ea6b35a80c6a372e4b78 /source4/lib/replace | |
| parent | aea41afb52e24077e7b1e28f5090326665d7c3f6 (diff) | |
| download | samba-6262602b4ff1aff61103069b03b707fb66334555.tar.gz samba-6262602b4ff1aff61103069b03b707fb66334555.tar.bz2 samba-6262602b4ff1aff61103069b03b707fb66334555.zip | |
r22217: merge from samba3 21944:
move acl header checks to the correct place only
metze
(This used to be commit be84eb68e1f0d3826b9f819fa44d8b399e38cbcd)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/system/config.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/replace/system/filesys.h | 4 |
2 files changed, 6 insertions, 1 deletions
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 <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 |