[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a5cfdde s3-waf: try to fix the build with snow leopard.
      from  4ce3b53 s3:selftest: fix knownfail for samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a5cfdde558314ea8bd8b9421d0fffd9acbfb7de9
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 13 12:56:38 2010 +0100

    s3-waf: try to fix the build with snow leopard.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Dec 13 15:03:08 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index c02f2a2..684461f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -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'):


-- 
Samba Shared Repository