sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

build: Move --without-json-audit and json lib detection to lib/audit_logging

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2018-06-22 04:47:10 +12:00 committed by Ralph Boehme
parent b282bcbb75
commit 5bb60e2dd7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auth/wscript → lib/audit_logging/wscript
View File

@ -32,4 +32,3 @@ def configure(conf):
raise Utils.WafError('jansson JSON library required for '
'--enable-selftest when building the AD DC')
Logs.info("Building without jansson json log support")

5
wscript
View File

@ -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()