s3/utils: Add search client

[samba.git] / source3 / utils / wscript_build

diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index c28fd862b3a5bd48e7098d0e7bea2d0b65d5b694..7a28de857e11e2a68e68b1a1f8a09ee3ea64685a 100644 (file)
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -7,6 +7,10 @@ bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
 bld.SAMBA3_SUBSYSTEM('CONN_TDB',
                      source='conn_tdb.c')
 
+bld.SAMBA3_SUBSYSTEM('DNS_UTIL',
+                     source='net_dns.c net_ads_join_dns.c',
+                     deps='addns')
+
 bld.SAMBA3_BINARY('profiles',
                  source='profiles.c',
                  deps='''
@@ -20,7 +24,7 @@ bld.SAMBA3_BINARY('smbcontrol',
                  deps='''
                  talloc
                  smbconf
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
                  PRINTBASE''')
 
@@ -31,7 +35,7 @@ bld.SAMBA3_BINARY('smbtree',
                  smbconf
                  smbclient
                  msrpc3
-                 popt_samba3_cmdline
+                 CMDLINE_S3
                  RPC_NDR_SRVSVC''')
 
 bld.SAMBA3_BINARY('smbpasswd',
@@ -50,7 +54,7 @@ bld.SAMBA3_BINARY('pdbedit',
                  deps='''
                  talloc
                  smbconf
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
                  pdb
                  PASSWD_UTIL''')
@@ -59,7 +63,7 @@ bld.SAMBA3_BINARY('smbget',
                  source='smbget.c',
                  deps='''
                  talloc
-                 popt_samba3_cmdline
+                 CMDLINE_S3
                  smbclient''')
 
 bld.SAMBA3_BINARY('nmblookup',
@@ -67,23 +71,24 @@ bld.SAMBA3_BINARY('nmblookup',
                  deps='''
                  talloc
                  smbconf
-                 popt_samba3
+                 CMDLINE_S3
                  LIBNMB''')
 
 bld.SAMBA3_BINARY('smbcacls',
-                 source='smbcacls.c ../lib/util_sd.c',
+                 source='smbcacls.c',
                  deps='''
                  talloc
-                 popt_samba3_cmdline
+                 CMDLINE_S3
                  msrpc3
                  libcli_lsa3
+                 util_sd
                  krb5samba''')
 
 bld.SAMBA3_BINARY('smbcquotas',
                  source='smbcquotas.c',
                  deps='''
                  talloc
-                 popt_samba3_cmdline
+                 CMDLINE_S3
                  libsmb
                  msrpc3
                  libcli_lsa3''')
@@ -98,13 +103,14 @@ bld.SAMBA3_BINARY('eventlogadm',
                  install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('sharesec',
-                 source='sharesec.c ../lib/util_sd.c',
+                 source='sharesec.c',
                  deps='''
                  talloc
                  msrpc3
                  libcli_lsa3
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
+                 util_sd
                  ''')
 
 bld.SAMBA3_BINARY('log2pcap',
@@ -127,15 +133,16 @@ bld.SAMBA3_BINARY('ntlm_auth',
                  krb5samba
                  tiniparser
                  libsmb
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
+                 wbclient
                  gse gensec''')
 
 bld.SAMBA3_BINARY('dbwrap_tool',
                  source='dbwrap_tool.c',
                  deps='''
                  talloc
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
                  ''')
 
@@ -143,14 +150,9 @@ bld.SAMBA3_BINARY('dbwrap_torture',
                  source='dbwrap_torture.c',
                  deps='''
                  talloc
-                 popt_samba3''',
-                 install=False)
-
-bld.SAMBA3_BINARY('split_tokens',
-                 source='split_tokens.c',
-                 deps='''
-                 talloc
-                 popt_samba3''',
+                 CMDLINE_S3
+                 smbconf
+                 ''',
                  install=False)
 
 bld.SAMBA3_BINARY('samba-regedit',
@@ -159,7 +161,13 @@ bld.SAMBA3_BINARY('samba-regedit',
                             regedit_valuelist.c regedit_dialog.c
                             regedit_hexedit.c regedit_list.c""",
                   deps='''
-                  ncurses menu panel form registry smbconf popt_samba3_cmdline
+                  ncurses
+                  menu
+                  panel
+                  form
+                  registry
+                  smbconf
+                  CMDLINE_S3
                   ''',
                   enabled=bld.env.build_regedit)
 
@@ -168,7 +176,7 @@ bld.SAMBA3_BINARY('testparm',
                  deps='''
                  talloc
                  smbconf
-                 popt_samba3
+                 CMDLINE_S3
                  cmdline_contexts
                  GNUTLS_HELPERS
                  ''')
@@ -200,11 +208,11 @@ bld.SAMBA3_BINARY('net',
                  net_util.c
                  net_rpc_sh_acct.c
                  net_rpc_audit.c
-                 net_dns.c
                  net_ads_gpo.c
                  net_conf.c
                  net_conf_util.c
                  net_join.c
+                 net_offlinejoin.c
                  net_user.c
                  net_group.c
                  net_file.c
@@ -225,14 +233,14 @@ bld.SAMBA3_BINARY('net',
                  ../registry/reg_format.c
                  ../registry/reg_import.c
                  net_registry_util.c
-                 ../lib/util_sd.c
                  net_help_common.c''',
                  deps='''
                  talloc
                  netapi
                  addns
                  samba_intl
-                 popt_samba3_cmdline
+                 CMDLINE_S3
+                 cmdline_contexts
                  pdb
                  libsmb
                  smbconf
@@ -268,6 +276,8 @@ bld.SAMBA3_BINARY('net',
                  jansson
                  common_auth
                  ADOUBLE
+                 DNS_UTIL
+                 util_sd
                  ''')
 
 bld.SAMBA3_BINARY('mvxattr',
@@ -288,19 +298,24 @@ bld.SAMBA3_BINARY('destroy_netlogon_creds_cli',
                   ''',
                   install=False)
 
-smbstatus_source = 'status.c ../smbd/notify_msg.c'
+smbstatus_source = 'status.c'
 
 if bld.CONFIG_GET("WITH_PROFILE"):
     smbstatus_source += ' status_profile.c'
 else:
     smbstatus_source += ' status_profile_dummy.c'
 
+if bld.CONFIG_GET("HAVE_JANSSON"):
+    smbstatus_source += ' status_json.c'
+else:
+    smbstatus_source += ' status_json_dummy.c'
+
 bld.SAMBA3_BINARY('smbstatus',
                  source=smbstatus_source,
                  deps='''
                       talloc
                       smbconf
-                      popt_samba3
+                      CMDLINE_S3
                       cmdline_contexts
                       smbd_base
                       LOCKING
@@ -314,18 +329,35 @@ bld.SAMBA3_BINARY('mdsearch',
                  talloc
                  tevent
                  smbconf
-                 popt_samba3
-                 popt_samba3_cmdline
+                 CMDLINE_S3
+                 cmdline_contexts
                  libsmb
                  msrpc3
                  RPCCLI_MDSSVC
                  mdssvc
                  ''')
 
+bld.SAMBA3_BINARY('wspsearch',
+                 source='wspsearch.c',
+                 deps='''
+                 talloc
+                 tevent
+                 smbconf
+                 CMDLINE_S3
+                 cmdline_contexts
+                 libsmb
+                 msrpc3
+                 LIBSAMBA_WSP
+                 RPCCLI_WSP
+                 WSP_UTIL
+                 dcerpc
+                 ''',
+                  enabled=bld.env.with_wsp)
+
 pytalloc_util = bld.pyembed_libname('pytalloc-util')
 pyrpc_util = bld.pyembed_libname('pyrpc_util')
 bld.SAMBA3_PYTHON('python_net_s3',
         source='py_net.c',
-        deps='LIBNET cmdline_contexts %s %s' % (pytalloc_util, pyrpc_util),
+        deps='LIBNET DNS_UTIL cmdline_contexts %s %s' % (pytalloc_util, pyrpc_util),
         realname='samba/net_s3.so'
         )