+++ /dev/null
-#!/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")
-
# We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
"samba-fileserver": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json-audit --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='${PY3_ONLY}"
def options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
- opt.RECURSE('lib/audit_logging')
opt.RECURSE('lib/replace')
opt.RECURSE('dynconfig')
opt.RECURSE('packaging')
opt.load('python') # options for disabling pyc or pyo compilation
# enable options related to building python extensions
+ opt.add_option('--with-json',
+ action='store_true', dest='with_json',
+ help=("Build with JSON support (default=True). This "
+ "requires the jansson development headers."))
+ opt.add_option('--without-json',
+ action='store_false', dest='with_json',
+ help=("Build without JSON support."))
def configure(conf):
version = samba_version.load_version(env=conf.env)
# system-provided or embedded Heimdal build
if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
conf.RECURSE('source4/heimdal_build')
- conf.RECURSE('lib/audit_logging')
conf.RECURSE('source4/lib/tls')
conf.RECURSE('source4/dsdb/samdb/ldb_modules')
conf.RECURSE('source4/ntvfs/sysdep')
Logs.warn("pthreadpool support cannot be enabled when __thread support was not found")
conf.undefine('WITH_PTHREADPOOL')
+ conf.SET_TARGET_TYPE('jansson', 'EMPTY')
+
+ if Options.options.with_json != 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 != False:
+ conf.fatal("Jansson JSON support not found. "
+ "Try installing libjansson-dev or jansson-devel. "
+ "Otherwise, use --without-json to build without "
+ "JSON support. "
+ "JSON support is required for the JSON "
+ "formatted audit log feature, the AD DC, and "
+ "the JSON printers of the net utility")
+ if not Options.options.without_ad_dc:
+ raise Errors.WafError('--without-json requires --without-ad-dc. '
+ 'Jansson JSON library is required for '
+ 'building the AD DC')
+ Logs.info("Building without Jansson JSON log support")
+
conf.RECURSE('source3')
conf.RECURSE('lib/texpect')
conf.RECURSE('python')