summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-08 11:19:35 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-08 04:52:03 +0200
commit078db8f6c9580e215d850d26e8a9942aa757e245 (patch)
tree9308bf801853f97fe51bf22e5ec99bef0695db34 /nsswitch
parent820fe8acca1454b43bc5454f56cf848d6250bc4c (diff)
downloadsamba-078db8f6c9580e215d850d26e8a9942aa757e245.tar.gz
samba-078db8f6c9580e215d850d26e8a9942aa757e245.tar.bz2
samba-078db8f6c9580e215d850d26e8a9942aa757e245.zip
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
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/wbinfo.c3
-rw-r--r--nsswitch/wscript_build5
2 files changed, 7 insertions, 1 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 6459b8e4c2..e7f902f08b 100644
--- 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 4e353d3bd3..f740fdf25f 100644
--- 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'
+ )