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 d70866280193f44fd8b63da77727ab47832c886c..47f6fbcc23cef7aede15651d40e0f532e7a72f45 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -1,33 +1,41 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
-                    source='wb_common.c',
-                    deps='replace',
-                    cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR
-                    )
+bld.SAMBA_LIBRARY('winbind-client',
+       source='wb_common.c',
+       deps='replace',
+       cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+       private_library=True
+       )
 
 
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',
-       deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
+       deps='replace dl'
        )
 
 
-bld.SAMBA_BINARY('wbinfo',
-       source='wbinfo.c',
-       deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
-       )
+bld.SAMBA_LIBRARY('nss_winbind',
+       source='winbind_nss_linux.c',
+       deps='winbind-client',
+       realname='libnss_winbind.so.2',
+       vnum='2')
+
 
-bld.SAMBA_LIBRARY('nsswinbind',
-    source='../nsswitch/winbind_nss_linux.c',
-    deps='LIBWINBIND-CLIENT',
-    realname='libnss_winbind.so',
-    vnum='2')
-
-if bld.CONFIG_SET('HAVE_PAM_START'):
-    bld.SAMBA_LIBRARY('pamwinbind',
-        source='../nsswitch/pam_winbind.c',
-        deps='talloc LIBWBCLIENT LIBWINBIND-CLIENT LIBINIPARSER pam',
-        cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
-        realname='pam_winbind.so',
-        )
+if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
+       bld.SAMBA_LIBRARY('pamwinbind',
+               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'
+       )