diff options
| author | Günther Deschner <gd@samba.org> | 2010-10-05 11:38:45 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-10-05 10:50:53 +0000 |
| commit | 4aa8aaa6d2f114d4b9a4ab7d9314e9ec01ea3a69 (patch) | |
| tree | 40c4638c94549d78c3a217f8a6557f0be87bc947 /source3/wscript_build | |
| parent | d10a601ce0a9f1d66344c6c3b8cbb30c467b18a9 (diff) | |
| download | samba-4aa8aaa6d2f114d4b9a4ab7d9314e9ec01ea3a69.tar.gz samba-4aa8aaa6d2f114d4b9a4ab7d9314e9ec01ea3a69.tar.bz2 samba-4aa8aaa6d2f114d4b9a4ab7d9314e9ec01ea3a69.zip | |
s3-waf: convert NSS_INFO into a subsystem.
We don't do the fancy symlinking to idmap modules though.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Oct 5 10:50:53 UTC 2010 on sn-devel-104
Diffstat (limited to 'source3/wscript_build')
| -rw-r--r-- | source3/wscript_build | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 9dc83bc871..b5f277a539 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -481,11 +481,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c''' DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c''' -#FIXME: set NSS_INFO_STATIC during configuration -NSS_INFO_STATIC = '' -NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c' -NSS_INFO_SRC = 'winbindd/nss_info.c' - WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_group.c winbindd/winbindd_util.c @@ -580,7 +575,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c ../nsswitch/libwbclient/wb_reqtrans.c''' WINBINDD_SRC = '''${WINBINDD_SRC1} - ${NSS_INFO_SRC} ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC} ${TDB_VALIDATE_SRC} ${LIBCLI_DSSETUP_SRC} @@ -996,6 +990,7 @@ for prefix in bld.env.MODULE_PREFIXES: if prefix == 'perfcount': continue if prefix == 'gpext': continue if prefix == 'vfs': continue + if prefix == 'nss_info': continue static_key = "%s_STATIC" % prefix.upper() shared_key = "%s_SHARED" % prefix.upper() @@ -1332,8 +1327,8 @@ bld.SAMBA_BINARY('winbindd/winbindd', deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER - NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS - LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP + SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS + LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP NSS_INFO ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', |