[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  ff95491 s3-waf: fix dependencies to NDR_XATTR.
       via  1e97e73 s3-waf: link PReg parser only in registry client side extension.
      from  122e354 s3-waf: NDR_SRVSVC is defined now from the main librpc wscript_build.

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


- Log -----------------------------------------------------------------
commit ff9549192599ef5b88fade7e95fa9a4ccb9232a6
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 27 07:46:52 2010 +0200

    s3-waf: fix dependencies to NDR_XATTR.
    
    Guenther

commit 1e97e73c77a0033f416be20ecb7d418b619683fe
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 27 07:33:09 2010 +0200

    s3-waf: link PReg parser only in registry client side extension.
    
    Guenther

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

Summary of changes:
 source3/libgpo/gpext/wscript_build |    1 +
 source3/modules/wscript_build      |    2 ++
 source3/wscript_build              |   15 ++-------------
 3 files changed, 5 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 35d3546..c2cca3d 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -14,6 +14,7 @@ bld.SAMBA_SUBSYSTEM('GPEXT',
 bld.SAMBA_MODULE('GPEXT_REGISTRY',
                  subsystem='GPEXT',
                  source=GPEXT_REGISTRY_SRC,
+                 deps='NDR_PREG',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_REGISTRY'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_REGISTRY'))
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index c751c08..8f0e547 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -176,6 +176,7 @@ bld.SAMBA_MODULE('VFS_AFSACL',
 bld.SAMBA_MODULE('VFS_XATTR_TDB',
                  subsystem='VFS',
                  source=VFS_XATTR_TDB_SRC,
+                 deps='NDR_XATTR',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_XATTR_TDB'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_XATTR_TDB'))
@@ -349,6 +350,7 @@ bld.SAMBA_MODULE('VFS_ACL_XATTR',
 bld.SAMBA_MODULE('VFS_ACL_TDB',
                  subsystem='VFS',
                  source=VFS_ACL_TDB_SRC,
+                 deps='NDR_XATTR',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_TDB'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_TDB'))
diff --git a/source3/wscript_build b/source3/wscript_build
index d3f06e6..e42e84b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -62,15 +62,6 @@ LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
-LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
-                           ../librpc/ndr/ndr_ntprinting.c'''
-
-LIBNDR_PREG_SRC = '''librpc/gen_ndr/ndr_preg.c
-                     librpc/ndr/ndr_preg.c'''
-
-LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
-                  ../librpc/ndr/ndr_xattr.c'''
-
 LIBCLI_SPOOLSS_SRC = '''
                      ../librpc/gen_ndr/cli_spoolss.c
                      ../librpc/gen_ndr/ndr_spoolss_c.c
@@ -679,8 +670,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_CLIENT_SCHANNEL_SRC}
                 rpc_client/init_netlogon.c
                 rpc_client/init_samr.c
-                ${PRIVILEGES_BASIC_SRC}
-                ${LIBNDR_XATTR_SRC}'''
+                ${PRIVILEGES_BASIC_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
@@ -880,7 +870,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_serverid.c
               utils/net_eventlog.c
               utils/net_printing.c
-              ${LIBNDR_PREG_SRC}
               ${LIBCLI_SPOOLSS_SRC}
               ${LIBCLI_WINREG_SRC}
               ${LIBCLI_DRSUAPI_SRC}
@@ -1224,7 +1213,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                     VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG
-                    REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES''',
+                    REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('RPC_MODULES',


-- 
Samba Shared Repository