[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  aee5e95 s3-waf: add check for struct stat st_flags member.
       via  1662422 s3-waf: add some missing checks for macosx.
      from  34b24e6 s3-waf: add check for __NR_inotify_init declaration.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit aee5e955c8fabd5950c980fe21e2cf8e3db598f3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 22:15:20 2011 +0100

    s3-waf: add check for struct stat st_flags member.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Feb 16 23:04:35 CET 2011 on sn-devel-104
    (cherry picked from commit 9e822f103298519db0671a1dced7d8a43cd96f6c)

commit 166242260411e42116d158ac703ce7dec8ac27b8
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 21:58:47 2011 +0100

    s3-waf: add some missing checks for macosx.
    
    Guenther
    (cherry picked from commit afb77d135e31b7aa5f6dbd10113b0bf43a734986)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index df82cc6..c87fb45 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -191,6 +191,8 @@ main() {
                                 headers='sys/stat.h')
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize', define='HAVE_STAT_ST_BLKSIZE',
                                 headers='sys/stat.h')
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_flags', define='HAVE_STAT_ST_FLAGS',
+				headers='sys/types.h sys/stat.h unistd.h')
 
     # Check for POSIX capability support
     conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
@@ -446,6 +448,8 @@ return acl_get_perm_np(permset_d, perm);
             conf.CHECK_CODE('struct aiocb a; return aio_error64(&a);', 'HAVE_AIO_ERROR64', msg='Checking for aio_error64', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_cancel64(1, &a);', 'HAVE_AIO_CANCEL64', msg='Checking for aio_cancel64', headers='aio.h', lib='aio rt')
 	    conf.CHECK_CODE('struct aiocb a; return aio_suspend64(&a, 1, NULL);', 'HAVE_AIO_SUSPEND64', msg='Checking for aio_suspend64', headers='aio.h', lib='aio rt')
+        if not conf.CONFIG_SET('HAVE_AIO'):
+            conf.DEFINE('HAVE_NO_AIO', '1')
     else:
         conf.DEFINE('HAVE_NO_AIO', '1')
 
@@ -1067,6 +1071,14 @@ exit(1);
        conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_UMTIME'):
         conf.DEFINE('HAVE_STAT_HIRES_TIMESTAMPS', '1')
 
+    # recent FreeBSD, NetBSD have creation timestamps called birthtime:
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtime',
+				define='HAVE_STRUCT_STAT_ST_BIRTHTIME')
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtimespec.tv_nsec',
+				define='HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC')
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtimensec',
+				define='HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC')
+
     conf.CHECK_CODE('''
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
@@ -1087,6 +1099,14 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
 
     conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
 
+    conf.CHECK_CODE('''
+#include <sys/syscall.h>
+#include <unistd.h>
+syscall(SYS_initgroups, 16, NULL, NULL, 0);
+		    ''',
+		    'HAVE_DARWIN_INITGROUPS',
+		    msg='Checking hether to use the Darwin-specific initgroups system call')
+
     default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
                                       auth_sam auth_unix auth_winbind auth_wbc auth_server
                                       auth_domain auth_builtin vfs_default
@@ -1124,6 +1144,9 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
     if conf.CONFIG_SET('HAVE_LDAP'):
         default_static_modules.extend(TO_LIST('pdb_ldap idmap_ldap'))
 
+    if conf.CONFIG_SET('DARWINOS'):
+	default_shared_modules.extend(TO_LIST('charset_macosxfs'))
+
     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
 


-- 
Samba Shared Repository