diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2018-06-22 04:50:09 +1200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2018-06-25 23:01:20 +0200 |
| commit | a2783fe1a3a93c6e3d106b2ab23c8c9acd3d382b (patch) | |
| tree | f496e54d2f7bd7bccff14b26727be5f9d652848d /lib/audit_logging | |
| parent | 5bb60e2dd714862c3cda69a42f0f58fa4e7d816d (diff) | |
| download | samba-a2783fe1a3a93c6e3d106b2ab23c8c9acd3d382b.tar.gz | |
lib/audit_logging: Require jansson JSON library for building the AD DC
This combination is untested and it is reasonable to require this
broadly available library for the AD DC build.
Doing so keeps the combinational complexity down and ensures we test
what we ship. (It was failing to compile).
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'lib/audit_logging')
| -rw-r--r-- | lib/audit_logging/wscript | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/audit_logging/wscript b/lib/audit_logging/wscript index 7818ed0ecfa..d40fc6f079f 100644 --- a/lib/audit_logging/wscript +++ b/lib/audit_logging/wscript @@ -21,14 +21,16 @@ def configure(conf): if not conf.CONFIG_GET('HAVE_JSON_OBJECT'): if Options.options.with_json_audit != False: - conf.fatal("JSON support not found. " + 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") - if conf.CONFIG_GET('ENABLE_SELFTEST') and \ - (not Options.options.without_ad_dc): - raise Utils.WafError('jansson JSON library required for ' - '--enable-selftest when building the AD DC') - Logs.info("Building without jansson json log support") + "formatted audit log feature and the AD DC") + if not Options.options.without_ad_dc: + raise Utils.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") + |