build: build wbinfo only once in the waf build

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Oct  8 04:52:03 CEST 2011 on sn-devel-104

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 6459b8e4c29c75c736116f2a593b3d25509ece48..e7f902f08b160dba87e0fae8a43ae3e4f9258d16 100644 (file)
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -22,13 +22,14 @@
 */
 
 #include "includes.h"
-#include "popt_common.h"
 #include "winbind_client.h"
 #include "libwbclient/wbclient.h"
 #include "lib/popt/popt.h"
 #include "../libcli/auth/libcli_auth.h"
 #if (_SAMBA_BUILD_) >= 4
 #include "lib/cmdline/popt_common.h"
+#else
+#include "popt_common.h"
 #endif
 
 #ifdef DBGC_CLASS

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 4e353d3bd34f3ef03a2501b04e10430b660e9040..f740fdf25f0956d59f8a08cf0f96c3340024356a 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -40,3 +40,8 @@ bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
        source='wb_reqtrans.c',
        deps='talloc tevent LIBASYNC_REQ'
        )
+
+bld.SAMBA_BINARY('wbinfo',
+       source='wbinfo.c',
+       deps='samba-util LIBCLI_AUTH popt POPT_SAMBA wbclient LIBAFS_SETTOKEN'
+       )

diff --git a/source3/wscript_build b/source3/wscript_build
index 2e54195ff0b620b740da1f8c99badaabb8b894fd..78b24746b36bc9affd17203ff7b642aad1cc86f1 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -606,8 +606,6 @@ SMBFILTER_SRC = '''utils/smbfilter.c'''
 
 WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
 
-WBINFO_SRC = '''../nsswitch/wbinfo.c'''
-
 NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
 
 NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
@@ -1338,13 +1336,6 @@ bld.SAMBA3_BINARY('versiontest',
                  deps='SAMBA_VERSION samba3core param',
                  vars=locals())
 
-bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
-                 source=WBINFO_SRC,
-                 deps='''talloc wbclient tevent cap
-                 asn1util LIBTSOCKET pdb ldap param smbd_shim
-                 LIBNTLMSSP popt_samba3 LIBAFS_SETTOKEN''',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
                  source=NTLM_AUTH_SRC,
                  deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim

diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 8bf5d766e0878a8b81229d1533954208ae5b76d9..5ba9c2ae0f988b320e2b4190dc73d4ebe47e0f7a 100644 (file)
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -24,7 +24,3 @@ bld.SAMBA_SUBSYSTEM('IDMAP',
        public_deps='samdb-common ldbsamba'
        )
 
-bld.SAMBA_BINARY('wbinfo',
-       source='../../nsswitch/wbinfo.c',
-       deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent tevent-util LIBASYNC_REQ security ndr NDR_SECURITY'
-       )