summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-03 22:11:31 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-03 16:03:59 +0200
commitad26c2a726b3a4688648d54a3e88bd38c8db5607 (patch)
tree5bbdb2710bc12759448e9a0b19e2d57dac54745b /source3
parent6ac6b196e6ce329873df34e8fda8eacf40acb0dd (diff)
downloadsamba-ad26c2a726b3a4688648d54a3e88bd38c8db5607.tar.gz
samba-ad26c2a726b3a4688648d54a3e88bd38c8db5607.tar.bz2
samba-ad26c2a726b3a4688648d54a3e88bd38c8db5607.zip
build: Match autoconf build and disable ACLs on MacOS (darwin)
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 16:03:59 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/wscript10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/wscript b/source3/wscript
index b08fc77d17..7136c47714 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -305,8 +305,12 @@ utimensat vsyslog _write __write __xstat
#FIXME: add more checks
if Options.options.with_acl_support:
- conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
- if conf.CHECK_CODE('''
+ if (host_os.rfind('darwin') > -1):
+ conf.DEFINE('HAVE_NO_ACLS', 1)
+ conf.SET_TARGET_TYPE('acl', 'EMPTY')
+ else:
+ conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
+ if conf.CHECK_CODE('''
acl_t acl;
int entry_id;
acl_entry_t *entry_p;
@@ -315,7 +319,7 @@ return acl_get_entry(acl, entry_id, entry_p);
'HAVE_POSIX_ACLS',
headers='sys/types.h sys/acl.h', link=False,
msg="Checking for POSIX ACL support") :
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
acl_permset_t permset_d;
acl_perm_t perm;
return acl_get_perm_np(permset_d, perm);