[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Aug 8 06:54:05 MDT 2011
The branch, master has been updated
via db06b61 build: Make credentials a public library for OpenChange to use
via dd49eb8 build: rename rpcommon to dcerpc-binding an make a public library
via af5f494 build: provide tevent-util as a public library
from 07840b6 s3-waf: Fix build on FreeBSD when sunacl.h is found
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit db06b61a1d3d38140578c004eb9d6cb3243d2870
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 29 17:04:11 2011 +1000
build: Make credentials a public library for OpenChange to use
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon Aug 8 14:53:53 CEST 2011 on sn-devel-104
commit dd49eb87ce6be3ffde73eb675ac0217b7fcab202
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 29 17:03:45 2011 +1000
build: rename rpcommon to dcerpc-binding an make a public library
OpenChange needs this library.
Andrew Bartlett
commit af5f494bd2defe598dd8530359a249e0dd5ae20e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 29 17:01:38 2011 +1000
build: provide tevent-util as a public library
This is needed so that OpenChange can get at _tevent_req_nterr(), which is referenced
by generated PIDL output.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
auth/gensec/wscript_build | 2 +-
lib/async_req/wscript_build | 2 +-
lib/util/wscript_build | 3 +-
lib/wscript_build | 2 +-
libcli/cldap/wscript_build | 2 +-
libcli/echo/tests/wscript_build | 2 +-
libcli/echo/wscript_build | 2 +-
libcli/nbt/wscript_build | 2 +-
librpc/wscript_build | 80 ++++++++++++++++----------------
source3/wscript_build | 8 ++--
source4/auth/credentials/wscript_build | 2 +-
source4/auth/gensec/wscript_build | 2 +-
source4/auth/ntlm/wscript_build | 2 +-
source4/lib/tls/wscript | 2 +-
source4/libcli/smb2/wscript_build | 2 +-
source4/libcli/wscript_build | 6 +-
source4/librpc/wscript_build | 2 +-
source4/winbind/wscript_build | 2 +-
18 files changed, 63 insertions(+), 62 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/wscript_build b/auth/gensec/wscript_build
index 4daa1de..a9203f8 100644
--- a/auth/gensec/wscript_build
+++ b/auth/gensec/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_SUBSYSTEM('gensec_runtime',
source='gensec.c',
- deps='UTIL_TEVENT tevent samba-util LIBTSOCKET',
+ deps='tevent-util tevent samba-util LIBTSOCKET',
public_headers='gensec.h',
autoproto='gensec_toplevel_proto.h')
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index 352861c..0de58e4 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -4,6 +4,6 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
public_deps='talloc tevent',
- deps='UTIL_TEVENT'
+ deps='tevent-util'
)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index ee963ad..82af65c 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -48,12 +48,13 @@ bld.SAMBA_LIBRARY('UTIL_TDB',
private_library=True
)
-bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
+bld.SAMBA_LIBRARY('tevent-util',
source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
local_include=False,
public_deps='tevent',
public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
header_path=[ ('*', 'util') ],
+ vnum='0.0.1'
)
diff --git a/lib/wscript_build b/lib/wscript_build
index 9ce832a..97c3cfa 100644
--- a/lib/wscript_build
+++ b/lib/wscript_build
@@ -31,4 +31,4 @@ bld.SAMBA_LIBRARY('samba-sockets',
source=[],
private_library=True,
grouping_library=True,
- deps='LIBTSOCKET samba_socket UTIL_TEVENT')
+ deps='LIBTSOCKET samba_socket tevent-util')
diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build
index c6257b2..889c0af 100644
--- a/libcli/cldap/wscript_build
+++ b/libcli/cldap/wscript_build
@@ -4,7 +4,7 @@
bld.SAMBA_LIBRARY('cli_cldap',
source='cldap.c',
public_deps='cli-ldap',
- deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON',
+ deps='LIBTSOCKET samba-util tevent-util ldb LIBCLI_NETLOGON',
private_library=True
)
diff --git a/libcli/echo/tests/wscript_build b/libcli/echo/tests/wscript_build
index 7e58130..366c895 100644
--- a/libcli/echo/tests/wscript_build
+++ b/libcli/echo/tests/wscript_build
@@ -4,5 +4,5 @@ bld.SAMBA_MODULE('TORTURE_LIBCLI_ECHO',
source='echo.c',
subsystem='smbtorture',
init_function='torture_libcli_echo_init',
- deps='LIBTSOCKET UTIL_TEVENT LIBCLI_ECHO',
+ deps='LIBTSOCKET tevent-util LIBCLI_ECHO',
internal_module=True);
diff --git a/libcli/echo/wscript_build b/libcli/echo/wscript_build
index eedb4ac..a9de131 100644
--- a/libcli/echo/wscript_build
+++ b/libcli/echo/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_ECHO',
source='echo.c',
- deps='LIBTSOCKET UTIL_TEVENT');
+ deps='LIBTSOCKET tevent-util');
bld.RECURSE('tests')
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 07d8c51..2c70a1d 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -14,7 +14,7 @@ bld.SAMBA_SUBSYSTEM('lmhosts',
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('cli-nbt',
source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c',
- public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util lmhosts',
+ public_deps='ndr NDR_NBT tevent tevent-util NDR_SECURITY samba_socket samba-util lmhosts',
private_library=True
)
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 8242741..444cb94 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -358,114 +358,114 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
source='gen_ndr/ndr_xattr_c.c',
- public_deps='NDR_XATTR rpccommon'
+ public_deps='NDR_XATTR dcerpc-binding'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
source='gen_ndr/ndr_rot_c.c',
- public_deps='NDR_ROT rpccommon'
+ public_deps='NDR_ROT dcerpc-binding'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
source='gen_ndr/ndr_atsvc_c.c',
- public_deps='rpccommon NDR_ATSVC'
+ public_deps='dcerpc-binding NDR_ATSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
source='gen_ndr/ndr_audiosrv_c.c',
- public_deps='NDR_AUDIOSRV rpccommon'
+ public_deps='NDR_AUDIOSRV dcerpc-binding'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
source='gen_ndr/ndr_echo_c.c',
- public_deps='rpccommon NDR_ECHO'
+ public_deps='dcerpc-binding NDR_ECHO'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
source='gen_ndr/ndr_dsbackup_c.c',
- public_deps='rpccommon NDR_DSBACKUP'
+ public_deps='dcerpc-binding NDR_DSBACKUP'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
source='gen_ndr/ndr_efs_c.c',
- public_deps='rpccommon NDR_EFS'
+ public_deps='dcerpc-binding NDR_EFS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
source='gen_ndr/ndr_lsa_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
source='gen_ndr/ndr_samr_c.c',
- public_deps='rpccommon NDR_SAMR'
+ public_deps='dcerpc-binding NDR_SAMR'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
source='gen_ndr/ndr_dfs_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
source='gen_ndr/ndr_frsapi_c.c',
- public_deps='rpccommon NDR_FRSAPI'
+ public_deps='dcerpc-binding NDR_FRSAPI'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
source='gen_ndr/ndr_drsuapi_c.c',
- public_deps='rpccommon NDR_DRSUAPI'
+ public_deps='dcerpc-binding NDR_DRSUAPI'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
source='gen_ndr/ndr_drsblobs_c.c',
- public_deps='rpccommon NDR_DRSBLOBS'
+ public_deps='dcerpc-binding NDR_DRSBLOBS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
source='gen_ndr/ndr_policyagent_c.c',
- public_deps='rpccommon NDR_POLICYAGENT'
+ public_deps='dcerpc-binding NDR_POLICYAGENT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
source='gen_ndr/ndr_unixinfo_c.c',
- public_deps='rpccommon NDR_UNIXINFO'
+ public_deps='dcerpc-binding NDR_UNIXINFO'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
source='gen_ndr/ndr_browser_c.c',
- public_deps='rpccommon NDR_BROWSER'
+ public_deps='dcerpc-binding NDR_BROWSER'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
source='gen_ndr/ndr_spoolss_c.c',
- public_deps='rpccommon NDR_SPOOLSS'
+ public_deps='dcerpc-binding NDR_SPOOLSS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
source='gen_ndr/ndr_nbt_c.c',
- public_deps='rpccommon NDR_NBT'
+ public_deps='dcerpc-binding NDR_NBT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
source='gen_ndr/ndr_wkssvc_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
source='gen_ndr/ndr_srvsvc_c.c',
- public_deps='rpccommon NDR_SRVSVC'
+ public_deps='dcerpc-binding NDR_SRVSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
source='gen_ndr/ndr_svcctl_c.c',
- public_deps='rpccommon ndr-standard',
+ public_deps='dcerpc-binding ndr-standard',
public_headers='gen_ndr/ndr_svcctl_c.h ndr/ndr_svcctl.h',
header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
source='gen_ndr/ndr_eventlog_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
@@ -475,27 +475,27 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
source='gen_ndr/ndr_dbgidl_c.c',
- public_deps='rpccommon NDR_DBGIDL'
+ public_deps='dcerpc-binding NDR_DBGIDL'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
source='gen_ndr/ndr_dssetup_c.c',
- public_deps='rpccommon NDR_DSSETUP'
+ public_deps='dcerpc-binding NDR_DSSETUP'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
source='gen_ndr/ndr_msgsvc_c.c',
- public_deps='rpccommon NDR_MSGSVC'
+ public_deps='dcerpc-binding NDR_MSGSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
source='gen_ndr/ndr_winreg_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
source='gen_ndr/ndr_initshutdown_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
@@ -505,32 +505,32 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
source='gen_ndr/ndr_oxidresolver_c.c',
- public_deps='rpccommon NDR_OXIDRESOLVER'
+ public_deps='dcerpc-binding NDR_OXIDRESOLVER'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
source='gen_ndr/ndr_remact_c.c',
- public_deps='rpccommon NDR_REMACT'
+ public_deps='dcerpc-binding NDR_REMACT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
source='gen_ndr/ndr_wzcsvc_c.c',
- public_deps='rpccommon NDR_WZCSVC'
+ public_deps='dcerpc-binding NDR_WZCSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
source='gen_ndr/ndr_w32time_c.c',
- public_deps='rpccommon NDR_W32TIME'
+ public_deps='dcerpc-binding NDR_W32TIME'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
source='gen_ndr/ndr_scerpc_c.c',
- public_deps='rpccommon NDR_SCERPC'
+ public_deps='dcerpc-binding NDR_SCERPC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
source='gen_ndr/ndr_ntsvcs_c.c',
- public_deps='rpccommon ndr-standard'
+ public_deps='dcerpc-binding ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
@@ -540,22 +540,22 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
source='gen_ndr/ndr_trkwks_c.c',
- public_deps='rpccommon NDR_TRKWKS'
+ public_deps='dcerpc-binding NDR_TRKWKS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
source='gen_ndr/ndr_keysvc_c.c',
- public_deps='rpccommon NDR_KEYSVC'
+ public_deps='dcerpc-binding NDR_KEYSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
source='gen_ndr/ndr_backupkey_c.c',
- public_deps='rpccommon NDR_BACKUPKEY'
+ public_deps='dcerpc-binding NDR_BACKUPKEY'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSP',
source='gen_ndr/ndr_dnsp_c.c',
- public_deps='rpccommon NDR_DNSP'
+ public_deps='dcerpc-binding NDR_DNSP'
)
# a grouping library for NDR subsystems that may be used by more than one target
@@ -587,7 +587,7 @@ bld.SAMBA_LIBRARY('ndr',
vnum='0.0.1'
)
-bld.SAMBA_LIBRARY('rpccommon',
+bld.SAMBA_LIBRARY('dcerpc-binding',
source='rpc/dcerpc_error.c rpc/binding.c rpc/dcerpc_util.c rpc/binding_handle.c',
- deps='ndr tevent NDR_DCERPC LIBTSOCKET UTIL_TEVENT',
- private_library=True)
+ deps='ndr tevent NDR_DCERPC LIBTSOCKET tevent-util',
+ vnum='0.0.1')
diff --git a/source3/wscript_build b/source3/wscript_build
index 42a12be..36e8c50 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -699,7 +699,7 @@ bld.SAMBA3_LIBRARY('msrpc3',
source='${LIBMSRPC_SRC}',
deps='''ndr ndr-standard
RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
- LIBTSOCKET KRB5_WRAP rpccommon
+ LIBTSOCKET KRB5_WRAP dcerpc-binding
libsmb''',
vars=locals(),
private_library=True)
@@ -812,7 +812,7 @@ bld.SAMBA3_LIBRARY('smbd_shim',
bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
source='',
- deps='errors3 pdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
+ deps='errors3 pdb ldap lber MSRPC_PARSE LIBCLI_AUTH dcerpc-binding',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
@@ -1413,8 +1413,8 @@ if not bld.env.toplevel_build:
source='lib/ldb_compat.c',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
- bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
- bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
+ bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='tevent-util')
+ bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='tevent-util')
bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', '')
########################## INCLUDES #################################
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index 6fb1a68..99de466 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('credentials',
autoproto='credentials_proto.h',
public_headers='credentials.h',
deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
- private_library=True
+ vnum='0.0.1'
)
bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 4eed751..9424419 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('gensec',
source='gensec_start.c socket.c gensec_tstream.c',
pc_files='gensec.pc',
autoproto='gensec_proto.h',
- public_deps='UTIL_TEVENT samba-util errors LIBPACKET auth_system_session gensec_runtime',
+ public_deps='tevent-util samba-util errors LIBPACKET auth_system_session gensec_runtime',
deps='com_err',
vnum='0.0.1'
)
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 29e54fd..b8634c8 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -51,7 +51,7 @@ bld.SAMBA_MODULE('auth4_unix',
bld.SAMBA_LIBRARY('auth4',
source='auth.c auth_util.c auth_simple.c',
autoproto='auth_proto.h',
- deps='samba-util security samdb credentials UTIL_TEVENT LIBWBCLIENT_OLD auth_unix_token',
+ deps='samba-util security samdb credentials tevent-util LIBWBCLIENT_OLD auth_unix_token',
private_library=True
)
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
index fc6fd88..f34d7e8 100644
--- a/source4/lib/tls/wscript
+++ b/source4/lib/tls/wscript
@@ -49,5 +49,5 @@ def configure(conf):
def build(bld):
bld.SAMBA_SUBSYSTEM('LIBTLS',
source='tls.c tlscert.c tls_tstream.c',
- public_deps='talloc gnutls gcrypt samba-hostconfig samba_socket LIBTSOCKET tevent UTIL_TEVENT'
+ public_deps='talloc gnutls gcrypt samba-hostconfig samba_socket LIBTSOCKET tevent tevent-util'
)
diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
index fc8e7b4..1f3d7ef 100644
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
autoproto='smb2_proto.h',
- deps='UTIL_TEVENT',
+ deps='tevent-util',
public_deps='cli_raw LIBPACKET gensec tevent'
)
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 2522ccc..3184a19 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -5,7 +5,7 @@ bld.RECURSE('wbclient')
bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
source='../../libcli/util/tstream.c',
- public_deps='LIBTSOCKET UTIL_TEVENT'
+ public_deps='LIBTSOCKET tevent-util'
)
@@ -27,13 +27,13 @@ bld.SAMBA_SUBSYSTEM('cli_composite',
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
autoproto='smb_composite/proto.h',
- deps='LIBCLI_SMB2 UTIL_TEVENT',
+ deps='LIBCLI_SMB2 tevent-util',
public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent'
)
bld.SAMBA_PYTHON('pysmb',
source='pysmb.c',
- deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 UTIL_TEVENT pyparam_util',
+ deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent',
realname='samba/smb.so'
)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 68141f6..e695c4e 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc',
rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
pc_files='dcerpc.pc',
- deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE UTIL_TEVENT rpccommon',
+ deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util dcerpc-binding',
autoproto='rpc/dcerpc_proto.h',
public_deps='credentials tevent talloc',
public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 09fee43..8bf5d76 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -26,5 +26,5 @@ bld.SAMBA_SUBSYSTEM('IDMAP',
bld.SAMBA_BINARY('wbinfo',
source='../../nsswitch/wbinfo.c',
- deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY'
--
Samba Shared Repository
More information about the samba-cvs
mailing list