[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  07840b6 s3-waf: Fix build on FreeBSD when sunacl.h is found
      from  47bffb9 s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357)

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


- Log -----------------------------------------------------------------
commit 07840b665f1adc6d821ef4a1aa22ca5cbfd5001c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Aug 8 11:16:20 2011 +1000

    s3-waf: Fix build on FreeBSD when sunacl.h is found
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Mon Aug  8 04:34:35 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 3164276..f7c12a8 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -351,7 +351,7 @@ utimensat vsyslog _write __write __xstat
         conf.ADD_CFLAGS('-fno-common')
     elif (host_os.rfind('freebsd') > -1):
         if conf.CHECK_HEADERS('sunacl.h'):
-            conf.define('HAVE_FREEBSD_SUNACL_H', '1')
+            conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
             conf.CHECK_FUNCS_IN('acl', 'sunacl')
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('netbsd') > -1):


-- 
Samba Shared Repository