[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Sun Aug 8 20:28:09 MDT 2010


The branch, master has been updated
       via  56db40d... s4-build: use @PACKAGE_VERSION@ in s4 pc.in files
       via  ebd4ea7... s4-build: added dcerpc_server library
      from  016418d... s3: Remove the smbd_messaging_context from load_printers

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


- Log -----------------------------------------------------------------
commit 56db40d5fd7b60361664d964fb92f687ac2ca3ce
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Aug 9 10:45:46 2010 +1000

    s4-build: use @PACKAGE_VERSION@ in s4 pc.in files
    
    this gets replaced by vnum from the build rule

commit ebd4ea733811a4e37bc7231bf2aa8fd5612ffb02
Author: Brad Hards <bradh at frogmouth.net>
Date:   Mon Aug 9 10:37:34 2010 +1000

    s4-build: added dcerpc_server library
    
    OpenChange needs this for dcerpc_register_ep_server()
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

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

Summary of changes:
 source4/auth/gensec/gensec.pc.in                   |    2 +-
 source4/lib/policy/policy.pc.in                    |    2 +-
 source4/lib/registry/registry.pc.in                |    2 +-
 source4/librpc/dcerpc.pc.in                        |    2 +-
 source4/librpc/dcerpc_atsvc.pc.in                  |    2 +-
 source4/librpc/dcerpc_samr.pc.in                   |    2 +-
 source4/param/samba-hostconfig.pc.in               |    2 +-
 .../dcerpc_server.pc.in}                           |   10 +++++-----
 source4/rpc_server/wscript_build                   |    8 +++++---
 9 files changed, 17 insertions(+), 15 deletions(-)
 copy source4/{librpc/dcerpc.pc.in => rpc_server/dcerpc_server.pc.in} (51%)


Changeset truncated at 500 lines:

diff --git a/source4/auth/gensec/gensec.pc.in b/source4/auth/gensec/gensec.pc.in
index faf772a..f50d2a8 100644
--- a/source4/auth/gensec/gensec.pc.in
+++ b/source4/auth/gensec/gensec.pc.in
@@ -6,6 +6,6 @@ modulesdir=${prefix}/modules/gensec
 
 Name: gensec
 Description: Generic Security Library
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lgensec 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/policy.pc.in
index 0ad849a..4848cbc 100644
--- a/source4/lib/policy/policy.pc.in
+++ b/source4/lib/policy/policy.pc.in
@@ -7,6 +7,6 @@ Name: policy
 Description: Active Directory Group Policy library
 Requires: talloc
 Requires.private: ldb
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lpolicy
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/lib/registry/registry.pc.in b/source4/lib/registry/registry.pc.in
index d981a45..386817d 100644
--- a/source4/lib/registry/registry.pc.in
+++ b/source4/lib/registry/registry.pc.in
@@ -7,6 +7,6 @@ Name: registry
 Description: Windows-style registry library
 Requires: talloc
 Requires.private: ldb
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lregistry 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/dcerpc.pc.in b/source4/librpc/dcerpc.pc.in
index 3960f2a..798b8df 100644
--- a/source4/librpc/dcerpc.pc.in
+++ b/source4/librpc/dcerpc.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: dcerpc
 Description: DCE/RPC client library
 Requires: ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldcerpc 
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in
index 060485c..4dafbc9 100644
--- a/source4/librpc/dcerpc_atsvc.pc.in
+++ b/source4/librpc/dcerpc_atsvc.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: dcerpc_atsvc
 Description: DCE/RPC client library - ATSVC
 Requires.private: dcerpc ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldcerpc_atsvc
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/dcerpc_samr.pc.in b/source4/librpc/dcerpc_samr.pc.in
index 903564d..5b5a157 100644
--- a/source4/librpc/dcerpc_samr.pc.in
+++ b/source4/librpc/dcerpc_samr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: dcerpc_samr
 Description: DCE/RPC client library - SAMR
 Requires.private: dcerpc ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldcerpc-samr 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/param/samba-hostconfig.pc.in b/source4/param/samba-hostconfig.pc.in
index b8ba240..7a6072c 100644
--- a/source4/param/samba-hostconfig.pc.in
+++ b/source4/param/samba-hostconfig.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: samba-hostconfig
 Description: Host-wide Samba configuration
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lsamba-hostconfig 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/dcerpc.pc.in b/source4/rpc_server/dcerpc_server.pc.in
similarity index 51%
copy from source4/librpc/dcerpc.pc.in
copy to source4/rpc_server/dcerpc_server.pc.in
index 3960f2a..17c8864 100644
--- a/source4/librpc/dcerpc.pc.in
+++ b/source4/rpc_server/dcerpc_server.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: dcerpc
-Description: DCE/RPC client library
-Requires: ndr
-Version: 0.0.1
-Libs: -L${libdir} -ldcerpc 
+Name: dcerpc_server
+Description: DCE/RPC server library
+Requires: dcerpc
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ldcerpc
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index f2808a4..d258d27 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -118,14 +118,16 @@ bld.SAMBA_MODULE('dcerpc_browser',
 	)
 
 
-bld.SAMBA_SUBSYSTEM('dcerpc_server',
+bld.SAMBA_LIBRARY('dcerpc_server',
 	source='dcerpc_server.c dcesrv_auth.c dcesrv_mgmt.c handles.c',
+	pc_files='dcerpc_server.pc',
+	deps='LIBCLI_AUTH LIBNDR samba_server_gensec',
+	public_deps='dcerpc',
 	autoproto='dcerpc_server_proto.h',
 	public_headers='dcerpc_server.h',
-	deps='LIBCLI_AUTH LIBNDR dcerpc samba_server_gensec'
+	vnum='0.0.1'
 	)
 
-
 bld.SAMBA_MODULE('DCESRV',
 	source='service_rpc.c',
 	autoproto='service_rpc.h',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list