turn --with-json-audit into global --with-json

Fold the build option --with-json-audit into the toplevel wscript
to reflect the fact that JSON support is no longer local to the
audit subsystem.

Signed-off-by: Philipp Gesang <philipp.gesang@intra2net.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

1 files changed, 0 insertions, 36 deletions

diff --git a/lib/audit_logging/wscript b/lib/audit_logging/wscript
deleted file mode 100644
index f99df055731..00000000000
--- a/lib/audit_logging/wscript
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-from waflib import Logs, Options, Errors
-import samba3
-
-def options(opt):
-    help = ("Build with JSON auth audit support (default=True). "
-            "This requires the jansson devel package.")
-
-    opt.SAMBA3_ADD_OPTION('json-audit', default=None, help=(help))
-
-    return
-
-def configure(conf):
-    conf.SET_TARGET_TYPE('jansson', 'EMPTY')
-
-    if Options.options.with_json_audit != False:
-        if conf.CHECK_CFG(package='jansson', args='--cflags --libs',
-                          msg='Checking for jansson'):
-            conf.CHECK_FUNCS_IN('json_object', 'jansson')
-
-    if not conf.CONFIG_GET('HAVE_JSON_OBJECT'):
-        if Options.options.with_json_audit != False:
-            conf.fatal("Jansson JSON support not found. "
-                       "Try installing libjansson-dev or jansson-devel. "
-                       "Otherwise, use --without-json-audit to build without "
-                       "JSON support. "
-                       "JSON support is required for the JSON "
-                       "formatted audit log feature and the AD DC")
-        if not Options.options.without_ad_dc:
-            raise Errors.WafError('--without-json-audit requires '
-                                 '--without-ad-dc. '
-                                 'Jansson JSON library is required for '
-                                 'building the AD DC')
-        Logs.info("Building without Jansson JSON log support")
-