[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Mon Nov 15 05:27:01 MST 2010


The branch, master has been updated
       via  c3e24bb heimdal_base: Fix include path so heim_threads.h can be found.
       via  f7bccc6 smb_server: Build as shared module.
       via  ee69c4f heimdal_base: Add missing dependency on replace.
       via  f91b7b5 nbtd: Build service as shared module.
      from  88d694a waf: fixed configure again on RHEL5

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


- Log -----------------------------------------------------------------
commit c3e24bb89f8a50476ac809aaa3fee409e639b0d0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 12:42:14 2010 +0100

    heimdal_base: Fix include path so heim_threads.h can be found.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon Nov 15 12:26:53 UTC 2010 on sn-devel-104

commit f7bccc6628db5434c304bcf42eaa249e87ba1f08
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 12:41:58 2010 +0100

    smb_server: Build as shared module.

commit ee69c4f4b3d2012037887c4124dd376eebb2f0af
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 12:24:45 2010 +0100

    heimdal_base: Add missing dependency on replace.

commit f91b7b5dab904613bd48f663ba768521995ed9e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 12:23:46 2010 +0100

    nbtd: Build service as shared module.

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

Summary of changes:
 source4/heimdal_build/wscript_build |    4 ++--
 source4/nbt_server/wscript_build    |    3 ++-
 source4/rpc_server/wscript_build    |    2 +-
 source4/smb_server/wscript_build    |    2 +-
 source4/smbd/wscript_build          |   10 +++++-----
 source4/torture/wscript_build       |    2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 4d8459e..0ebb339 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -684,8 +684,8 @@ HEIMDAL_SUBSYSTEM('HEIMDAL_HCRYPTO',
 
 HEIMDAL_SUBSYSTEM('HEIMDAL_BASE',
     'base/array.c base/bool.c base/dict.c base/heimbase.c base/string.c base/number.c base/null.c',
-    includes='../heimdal/base',
-    deps='roken'
+    includes='../heimdal/base ../heimdal/include',
+    deps='roken replace'
     )
 
 
diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index 6fe64a4..252a9b8 100644
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -42,6 +42,7 @@ bld.SAMBA_MODULE('service_nbtd',
 	source='nbt_server.c',
 	subsystem='service',
 	init_function='server_service_nbtd_init',
-	deps='NBT_SERVER process_model'
+	deps='NBT_SERVER process_model',
+	internal_module=False,
 	)
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 97fd41c..29c1723 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
 	autoproto='common/proto.h',
 	public_headers='common/common.h',
 	header_path='dcerpc_server',
-	deps='ldb DCERPC_SHARE'
+	deps='ldb DCERPC_SHARE samba_server_gensec'
 	)
 
 
diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build
index a9e150e..bdf6469 100644
--- a/source4/smb_server/wscript_build
+++ b/source4/smb_server/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('SERVICE_SMB',
 	subsystem='service',
 	init_function='server_service_smb_init',
 	deps='SMB_SERVER netif shares samba-hostconfig',
-	internal_module=True
+	internal_module=False,
 	)
 
 
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 3a59049..0d91d41 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
 bld.SAMBA_LIBRARY('service',
-                  source='service.c service_stream.c service_named_pipe.c service_task.c',
-                  autoproto='service_proto.h',
-                  deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model',
-                  private_library=True
-                  )
+	source='service.c service_stream.c service_named_pipe.c service_task.c',
+	autoproto='service_proto.h',
+	deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model',
+	private_library=True
+	)
 
 
 bld.SAMBA_SUBSYSTEM('PIDFILE',
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 9b802ef..e24e9f1 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
 	autoproto='rpc/proto.h',
 	subsystem='smbtorture',
 	init_function='torture_rpc_init',
-	deps='ndr-table RPC_NDR_UNIXINFO dcerpc-samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc-atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
+	deps='ndr-table RPC_NDR_UNIXINFO dcerpc-samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc-atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS SMB_SERVER',
 	internal_module=True
 	)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list