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

2 files changed, 52 insertions, 8 deletions

diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 5a9aa2ab68..db7d5e08a6 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -87,3 +87,52 @@ bld.SAMBA_MODULE('IDMAP_ADEX',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+
+NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
+NSS_INFO_SRC = 'nss_info.c'
+
+bld.SAMBA_SUBSYSTEM('NSS_INFO',
+                    source=NSS_INFO_SRC,
+                    vars=locals())
+
+bld.SAMBA_MODULE('NSS_INFO_TEMPLATE',
+                 subsystem='NSS_INFO',
+                 source=NSS_INFO_TEMPLATE_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('NSS_INFO_TEMPLATE'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('NSS_INFO_TEMPLATE'))
+
+bld.SAMBA_MODULE('NSS_INFO_ADEX',
+                 subsystem='NSS_INFO',
+                 source=IDMAP_ADEX_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+
+bld.SAMBA_MODULE('NSS_INFO_HASH',
+                 subsystem='NSS_INFO',
+                 source=IDMAP_HASH_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
+
+bld.SAMBA_MODULE('NSS_INFO_RFC2307',
+                 subsystem='NSS_INFO',
+                 source=IDMAP_AD_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+
+bld.SAMBA_MODULE('NSS_INFO_SFU20',
+                 subsystem='NSS_INFO',
+                 source=IDMAP_AD_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+
+bld.SAMBA_MODULE('NSS_INFO_SFU',
+                 subsystem='NSS_INFO',
+                 source=IDMAP_AD_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
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}',