diff options
| author | Günther Deschner <gd@samba.org> | 2010-09-27 07:46:52 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-27 07:46:52 +0200 |
| commit | ff9549192599ef5b88fade7e95fa9a4ccb9232a6 (patch) | |
| tree | 95048a9da0ca6efa32182acf5a8029737a2b4d99 | |
| parent | 1e97e73c77a0033f416be20ecb7d418b619683fe (diff) | |
| download | samba-ff9549192599ef5b88fade7e95fa9a4ccb9232a6.tar.gz samba-ff9549192599ef5b88fade7e95fa9a4ccb9232a6.tar.bz2 samba-ff9549192599ef5b88fade7e95fa9a4ccb9232a6.zip | |
s3-waf: fix dependencies to NDR_XATTR.
Guenther
| -rw-r--r-- | source3/modules/wscript_build | 2 | ||||
| -rw-r--r-- | source3/wscript_build | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index c751c08136..8f0e547dfa 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 803204d7fd..e42e84b000 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -62,12 +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_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 @@ -676,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 @@ -1220,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', |