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>

diff --git a/auth/wscript b/lib/audit_logging/wscript
similarity index 99%
rename from auth/wscript
rename to lib/audit_logging/wscript
index 7b2c65effe0425dda5f59fa8ef7e8cba9081e867..7818ed0ecfabd5da92e7eb40b3fd5064cad39394 100644 (file)
--- a/auth/wscript
+++ b/lib/audit_logging/wscript
@@ -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")
-

diff --git a/wscript b/wscript
index dbfc1210f7fb011af2b7d06e54fee0e405e1efa0..b1b69c15a20c5bf0ac0b95d64fa41f155eacfdb6 100644 (file)
--- 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()