s3-waf: try to fix the build with snow leopard.
authorGünther Deschner <gd@samba.org>
Mon, 13 Dec 2010 11:56:38 +0000 (12:56 +0100)
committerGünther Deschner <gd@samba.org>
Mon, 13 Dec 2010 14:03:08 +0000 (15:03 +0100)
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Dec 13 15:03:08 CET 2010 on sn-devel-104

source3/wscript

index c02f2a239decc477b54ca43ca56e5d62af3e8cb7..684461ffd0ed47a2dd37a49176a1d8ffc7e6bcfa 100644 (file)
@@ -317,6 +317,10 @@ return acl_get_perm_np(permset_d, perm);
                         'HAVE_ACL_GET_PERM_NP',
                         headers='sys/types.h sys/acl.h', link=True,
                         msg="Checking whether acl_get_perm_np() is available")
+        else:
+            conf.DEFINE('HAVE_NO_ACLS', 1)
+            conf.SET_TARGET_TYPE('acl', 'EMPTY')
+            conf.SET_TARGET_TYPE('attr', 'EMPTY')
     else:
         conf.DEFINE('HAVE_NO_ACLS', 1)
         conf.SET_TARGET_TYPE('acl', 'EMPTY')
@@ -352,7 +356,7 @@ return acl_get_perm_np(permset_d, perm);
         default_static_modules.extend(TO_LIST('rpc_rpcecho pdb_ads'))
         default_shared_modules.extend(TO_LIST('charset_weird perfcount_test'))
 
-    if Options.options.with_acl_support:
+    if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
         default_static_modules.extend(TO_LIST('vfs_posixacl'))
 
     if conf.CONFIG_SET('HAVE_DIRFD_DECL'):