s3-param: Rename loadparm_s3_context -> loadparm_s3_helpers

[kai/samba.git] / source3 / wscript

diff --git a/source3/wscript b/source3/wscript
index ccedb6947f88eb4a8b6b02e2038fdd4f01c4ed67..5b21c3bf31caf9b4c6f1108fb408db06f46795b9 100755 (executable)
--- a/source3/wscript
+++ b/source3/wscript
@@ -107,7 +107,7 @@ def configure(conf):
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-long ret = splice(0,0,1,0,400,0);
+long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
 ''',
         'HAVE_LINUX_SPLICE',
         headers='fcntl.h'):
@@ -812,7 +812,7 @@ int i; i = PAM_RADIO_TYPE;
 #endif
 ''',
                            '_HAVE_UNBROKEN_POSIX_FALLOCATE',
-                           msg='for broken posix_fallocate'):
+                           msg='Checking for broken posix_fallocate'):
         conf.DEFINE('HAVE_BROKEN_POSIX_FALLOCATE', '1')
 
 
@@ -961,25 +961,10 @@ main() {
                             headers='sys/sendfile.h',
                             msg='Checking for linux sendfile support')
 
-            # Try and cope with broken Linux sendfile....
-            conf.CHECK_CODE('''#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-                            #undef _FILE_OFFSET_BITS
-                            #endif
-                            #include <sys/sendfile.h>
-                            int tofd, fromfd;
-                            off_t offset;
-                            size_t total;
-                            ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
-                            ''',
-                            '_HAVE_BROKEN_LINUX_SENDFILE',
-                            msg='Checking for broken linux sendfile support')
             if conf.CONFIG_SET('_HAVE_SENDFILE'):
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('LINUX_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
-            elif conf.CONFIG_SET('_HAVE_BROKEN_LINUX_SENDFILE'):
-                conf.DEFINE('LINUX_BROKEN_SENDFILE_API', '1')
-                conf.DEFINE('WITH_SENDFILE', '1')
         elif (host_os.rfind('freebsd') > -1) or (host_os.rfind('dragonfly') > -1):
             conf.CHECK_CODE('''
                             #include <sys/types.h>
@@ -1340,7 +1325,7 @@ main() {
             PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
             PTHREAD_LDFLAGS='-pthread'
     if PTHREAD_LDFLAGS == 'error':
-        if conf.CHECK_FUNC('pthread_attr_init'):
+        if conf.CHECK_FUNCS('pthread_attr_init'):
             PTHREAD_CFLAGS='-D_REENTRANT'
             PTHREAD_LDFLAGS='-lpthread'
     # especially for HP-UX, where the CHECK_FUNC macro fails to test for
@@ -1382,10 +1367,11 @@ main() {
                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
                                       vfs_crossrename vfs_linux_xfs_sgid
-                                      vfs_time_audit idmap_autorid''')
+                                      vfs_time_audit idmap_autorid idmap_tdb2
+                                      idmap_rid idmap_hash''')
 
     if Options.options.developer:
-        default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond charset_weird'))
+        default_static_modules.extend(TO_LIST('charset_weird'))
         default_shared_modules.extend(TO_LIST('perfcount_test'))
         default_shared_modules.extend(TO_LIST('vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test'))
         default_shared_modules.extend(TO_LIST('auth_skel pdb_test'))