[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Dec 7 08:51:01 MST 2010


The branch, master has been updated
       via  94cfb49 s3-waf: add configure/declaration checks for fdatasync, readahead and splice.
       via  c5b2fd0 s3-waf: add valgrind configure checks.
      from  055a3e0 s4:libnet_samsync_ldb.c - simplify a talloc steal call

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


- Log -----------------------------------------------------------------
commit 94cfb49bb7051c7e979bcf168e467328b96ee631
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 7 15:33:51 2010 +0100

    s3-waf: add configure/declaration checks for fdatasync, readahead and splice.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Dec  7 16:50:23 CET 2010 on sn-devel-104

commit c5b2fd05afcf3e4e3e733ed917539add9c12e0b8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 7 14:59:53 2010 +0100

    s3-waf: add valgrind configure checks.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 7fe142d..da9a9db 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -121,6 +121,18 @@ def configure(conf):
     #FIXME: for some reason this one still fails
     conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
     conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
+    conf.CHECK_DECLS('fdatasync', reverse=True)
+    conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
+
+    if conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+long ret = splice(0,0,1,0,400,0);
+''',
+        'HAVE_LINUX_SPLICE',
+        headers='fcntl.h'):
+        conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
 
     # Check for inotify support
     conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
@@ -874,6 +886,10 @@ int i; i = PAM_RADIO_TYPE;
         conf.DEFINE('WITH_DNS_UPDATES', 1)
     else:
         conf.SET_TARGET_TYPE('uuid', 'EMPTY')
+    conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+    if Options.options.developer:
+        if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
+            conf.DEFINE('VALGRIND', '1')
 
     conf.SAMBA_CONFIG_H('include/config.h')
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list