[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Feb 1 15:22:01 MST 2011


The branch, master has been updated
       via  fbbe321 s3-waf: fix the build after linux netlink changes.
      from  ba4ec70 s3: Fix bug 7940 -- fall back for utimes calls

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


- Log -----------------------------------------------------------------
commit fbbe321d19d0774bf141eddf6dea86e8ae2cf64a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 1 19:22:04 2011 +0100

    s3-waf: fix the build after linux netlink changes.
    
    Volker, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Feb  1 23:21:50 CET 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 89ee79f..61e00aa 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -946,6 +946,20 @@ int i; i = PAM_RADIO_TYPE;
         if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
             conf.DEFINE('VALGRIND', '1')
 
+    if conf.CHECK_CODE('''
+#include <bits/sockaddr.h>
+#include <linux/netlink.h>
+''',
+		'HAVE_LINUX_NETLINK_H',
+                msg="Checking whether Linux netlink is available"):
+        conf.CHECK_CODE('''
+#include <bits/sockaddr.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+''',
+		'HAVE_LINUX_RTNETLINK_H',
+		msg='Checking whether Linux rtnetlink is available')
+
     conf.SAMBA_CONFIG_H('include/config.h')
 
 def ctags(ctx):
diff --git a/source3/wscript_build b/source3/wscript_build
index 6000069..23d55b9 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -80,6 +80,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c
+          lib/addrchange.c
           ${TDB_LIB_SRC}
           lib/debug.c lib/fault.c
           lib/interface.c lib/pidfile.c
@@ -604,6 +605,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
                 torture/test_async_echo.c
+                torture/test_addrchange.c
                 torture/test_posix_append.c
                 torture/test_smbsock_any_connect.c'''
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list