summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2018-06-22 04:47:10 +1200
committerRalph Boehme <slow@samba.org>2018-06-25 23:01:20 +0200
commit5bb60e2dd714862c3cda69a42f0f58fa4e7d816d (patch)
tree3e72a4da0d8d591c9a98a03ef79a2bd0da5370af /wscript
parentb282bcbb759bbb12797922e066aeb12c0df5b2f1 (diff)
downloadsamba-5bb60e2dd714862c3cda69a42f0f58fa4e7d816d.tar.gz
build: Move --without-json-audit and json lib detection to lib/audit_logging
This is the common location of the audit logging code now Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'wscript')
-rw-r--r--wscript5
1 files changed, 2 insertions, 3 deletions
diff --git a/wscript b/wscript
index dbfc1210f7f..b1b69c15a20 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ def system_mitkrb5_callback(option, opt, value, parser):
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
- opt.RECURSE('auth')
+ opt.RECURSE('lib/audit_logging')
opt.RECURSE('lib/replace')
opt.RECURSE('dynconfig')
opt.RECURSE('packaging')
@@ -213,7 +213,7 @@ def configure(conf):
# system-provided or embedded Heimdal build
if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
conf.RECURSE('source4/heimdal_build')
- conf.RECURSE('auth')
+ conf.RECURSE('lib/audit_logging')
conf.RECURSE('source4/lib/tls')
conf.RECURSE('source4/dsdb/samdb/ldb_modules')
conf.RECURSE('source4/ntvfs/sysdep')
@@ -251,7 +251,6 @@ def configure(conf):
if conf.env.with_ctdb:
conf.RECURSE('ctdb')
conf.RECURSE('lib/socket')
- conf.RECURSE('auth')
conf.RECURSE('packaging')
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()