[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Apr 17 09:49:03 MDT 2012
The branch, master has been updated
via 0a4ab49 waf: Use Logs.info() instead of print.
via 2c49782 waf: Add possibility to build with system libwbclient.
via e3ffb31 s3-waf: Add possibility to build with system libsmbclient.
via c09c288 s3-waf: Fix client/smbclient dependencies.
from 1334ed7 s3:libsmb/cliconnect: make use of ntlmssp_is_anonymous()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0a4ab49c3e3f6b121a5b8b9ae85976c3077cd361
Author: Andreas Schneider <asn at samba.org>
Date: Tue Apr 17 14:11:45 2012 +0200
waf: Use Logs.info() instead of print.
Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date: Tue Apr 17 17:48:23 CEST 2012 on sn-devel-104
commit 2c49782dc1069eebc9f5a5cd2a055b5912665595
Author: Andreas Schneider <asn at samba.org>
Date: Tue Apr 17 12:34:48 2012 +0200
waf: Add possibility to build with system libwbclient.
commit e3ffb31554927a24df35576bd753ee4eb2dc2a3c
Author: Andreas Schneider <asn at samba.org>
Date: Mon Apr 16 17:05:35 2012 +0200
s3-waf: Add possibility to build with system libsmbclient.
commit c09c288f7c239ec0d73091061d417e1562825c64
Author: Andreas Schneider <asn at samba.org>
Date: Mon Apr 16 17:07:05 2012 +0200
s3-waf: Fix client/smbclient dependencies.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/libwbclient/wscript | 28 ++++++++++++++++++++
nsswitch/libwbclient/wscript_build | 9 ------
source3/libsmb/wscript | 40 +++++++++++++++++++++++++++++
source3/wscript_build | 49 ++++++------------------------------
wscript | 2 +
wscript_build_embedded_heimdal | 4 ++-
wscript_build_system_heimdal | 4 ++-
wscript_build_system_mitkrb5 | 4 ++-
8 files changed, 87 insertions(+), 53 deletions(-)
create mode 100644 nsswitch/libwbclient/wscript
delete mode 100644 nsswitch/libwbclient/wscript_build
create mode 100644 source3/libsmb/wscript
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wscript b/nsswitch/libwbclient/wscript
new file mode 100644
index 0000000..8390af1
--- /dev/null
+++ b/nsswitch/libwbclient/wscript
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+import Options, Logs
+
+def configure(conf):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion='0'):
+ conf.define('USING_SYSTEM_LIBWBCLIENT', 1)
+
+def build(bld):
+ if bld.CONFIG_SET('USING_SYSTEM_LIBWBCLIENT'):
+ Logs.info("\tSelected system libwbclient build")
+ return
+
+ Logs.info("\tSelected embedded libwbclient build")
+
+ bld.SAMBA_LIBRARY('wbclient',
+ source='''
+ wbc_guid.c
+ wbc_idmap.c
+ wbclient.c
+ wbc_pam.c
+ wbc_pwd.c
+ wbc_sid.c
+ wbc_util.c''',
+ deps='winbind-client',
+ pc_files='wbclient.pc',
+ public_headers='wbclient.h',
+ vnum='0')
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
deleted file mode 100644
index 2b7fc08..0000000
--- a/nsswitch/libwbclient/wscript_build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_LIBRARY('wbclient',
- source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
- deps='winbind-client',
- pc_files='wbclient.pc',
- public_headers='wbclient.h',
- vnum='0'
- )
diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript
new file mode 100644
index 0000000..6260945
--- /dev/null
+++ b/source3/libsmb/wscript
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+import Options, Logs
+
+def configure(conf):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('smbclient', minversion='0'):
+ conf.define('USING_SYSTEM_LIBSMBCLIENT', 1)
+
+def build(bld):
+ if bld.CONFIG_SET('USING_SYSTEM_LIBSMBCLIENT'):
+ Logs.info("\tSelected system libsmbclient build")
+ return
+
+ Logs.info("\tSelected embedded libsmbclient build")
+ bld.SAMBA3_LIBRARY('smbclient',
+ source='''
+ libsmb_cache.c
+ libsmb_compat.c
+ libsmb_context.c
+ libsmb_dir.c
+ libsmb_file.c
+ libsmb_misc.c
+ libsmb_path.c
+ libsmb_printjob.c
+ libsmb_server.c
+ libsmb_stat.c
+ libsmb_xattr.c
+ libsmb_setget.c''',
+ public_deps='''
+ talloc
+ param
+ libsmb
+ KRBCLIENT
+ msrpc3
+ libcli_lsa3''',
+ public_headers='../include/libsmbclient.h',
+ abi_directory='ABI',
+ abi_match='smbc_*',
+ vnum='0.1.0',
+ pc_files='smbclient.pc')
diff --git a/source3/wscript_build b/source3/wscript_build
index d68dd5c..bd92414 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -462,23 +462,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
-LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
- libsmb/libsmb_compat.c
- libsmb/libsmb_context.c
- libsmb/libsmb_dir.c
- libsmb/libsmb_file.c
- libsmb/libsmb_misc.c
- libsmb/libsmb_path.c
- libsmb/libsmb_printjob.c
- libsmb/libsmb_server.c
- libsmb/libsmb_stat.c
- libsmb/libsmb_xattr.c
- libsmb/libsmb_setget.c'''
-
-LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}'''
-
-LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
-
LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
@@ -501,10 +484,10 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-CLIENT_SRC1 = '''client/client.c client/clitar.c
- client/dnsbrowse.c'''
-
-CLIENT_SRC = '''${CLIENT_SRC1}'''
+CLIENT_SRC = '''
+ client/client.c
+ client/clitar.c
+ client/dnsbrowse.c'''
LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
@@ -666,23 +649,6 @@ bld.SAMBA3_LIBRARY('netapi',
vnum='0',
vars=locals())
-bld.SAMBA3_LIBRARY('smbclient',
- source=LIBSMBCLIENT_SRC,
- public_deps='''
- talloc
- param
- libsmb
- KRBCLIENT
- msrpc3
- libcli_lsa3
- ''',
- public_headers='include/libsmbclient.h',
- abi_directory='libsmb/ABI',
- abi_match='smbc_*',
- vnum='0.1.0',
- pc_files='libsmb/smbclient.pc',
- vars=locals())
-
bld.SAMBA3_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb_compat''',
@@ -1263,10 +1229,10 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
param
ndr-standard
SMBREADLINE
- smbclient
+ libsmb
+ msrpc3
RPC_NDR_SRVSVC
- cli_smb_common''',
- vars=locals())
+ cli_smb_common''')
bld.SAMBA3_BINARY('net',
source=NET_SRC,
@@ -1614,6 +1580,7 @@ bld.RECURSE('libgpo/gpext')
bld.RECURSE('lib/pthreadpool')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
+bld.RECURSE('libsmb')
bld.RECURSE('modules')
bld.RECURSE('pam_smbpass')
bld.RECURSE('passdb')
diff --git a/wscript b/wscript
index 15e1ce5..d1c7121 100755
--- a/wscript
+++ b/wscript
@@ -95,6 +95,7 @@ def configure(conf):
conf.RECURSE('source4/auth')
conf.RECURSE('lib/nss_wrapper')
conf.RECURSE('nsswitch')
+ conf.RECURSE('nsswitch/libwbclient')
conf.RECURSE('lib/socket_wrapper')
conf.RECURSE('lib/uid_wrapper')
conf.RECURSE('lib/popt')
@@ -105,6 +106,7 @@ def configure(conf):
conf.RECURSE('selftest')
conf.RECURSE('source3')
conf.RECURSE('lib/addns')
+ conf.RECURSE('source3/libsmb')
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
diff --git a/wscript_build_embedded_heimdal b/wscript_build_embedded_heimdal
index 5cde652..9b829d8 100644
--- a/wscript_build_embedded_heimdal
+++ b/wscript_build_embedded_heimdal
@@ -1,2 +1,4 @@
-print "\tSelected embedded Heimdal build"
+import Logs
+
+Logs.info("\tSelected embedded Heimdal build")
bld.RECURSE('source4/heimdal_build')
diff --git a/wscript_build_system_heimdal b/wscript_build_system_heimdal
index e548d16..4ea8cd7 100644
--- a/wscript_build_system_heimdal
+++ b/wscript_build_system_heimdal
@@ -1,2 +1,4 @@
-print "\tSelected system Heimdal build"
+import Logs
+
+Logs.info("\tSelected system Heimdal build")
bld.RECURSE('source4/heimdal_build')
diff --git a/wscript_build_system_mitkrb5 b/wscript_build_system_mitkrb5
index efe5dd1..130e141 100644
--- a/wscript_build_system_mitkrb5
+++ b/wscript_build_system_mitkrb5
@@ -1,2 +1,4 @@
-print "\tSelected system MIT krb5 libraries, Heimdal use is disabled"
+import Logs
+
+Logs.info("\tSelected system MIT krb5 libraries, Heimdal use is disabled")
#bld.RECURSE('source4/heimdal_build')
--
Samba Shared Repository
More information about the samba-cvs
mailing list