librpc/ndr: consolidate string conversion logic in ndr_pull_string

[nivanova/samba-autobuild/.git] / nsswitch / wscript_build

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 223e24d451b1b0b37b3d51b8d48d938b72f0e766..47f6fbcc23cef7aede15651d40e0f532e7a72f45 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,25 +10,32 @@ bld.SAMBA_LIBRARY('winbind-client',
 
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',
-       deps='samba-util samba-hostconfig'
+       deps='replace dl'
        )
 
 
-bld.SAMBA_BINARY('wbinfo',
-       source='wbinfo.c',
-       deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY'
-       )
-
 bld.SAMBA_LIBRARY('nss_winbind',
-       source='../nsswitch/winbind_nss_linux.c',
+       source='winbind_nss_linux.c',
        deps='winbind-client',
        realname='libnss_winbind.so.2',
        vnum='2')
 
-if bld.CONFIG_SET('HAVE_PAM_START'):
+
+if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
        bld.SAMBA_LIBRARY('pamwinbind',
-               source='../nsswitch/pam_winbind.c',
-               deps='talloc wbclient winbind-client LIBINIPARSER pam intl',
+               source='pam_winbind.c',
+               deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
                cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
                realname='pam_winbind.so',
                )
+
+if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+       bld.SAMBA_LIBRARY('winbind_krb5_locator',
+               source='winbind_krb5_locator.c',
+               deps='wbclient krb5',
+               realname='winbind_krb5_locator.so')
+
+bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
+       source='wb_reqtrans.c',
+       deps='talloc tevent LIBASYNC_REQ'
+       )