[SCM] Samba Shared Repository - branch master updated

[bbaumbach at samba.org]

The branch, master has been updated
       via  cc1eed9 build: add option to choose to build with or without JSON audit support
      from  fc473cd nbt_server: Align integer types

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cc1eed99bda3773dc13e927f1df1c4fd72e4b848
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Apr 17 15:47:58 2018 +0200

    build: add option to choose to build with or without JSON audit support
    
    Add a new configure option:
    
      --with-json-audit
                Build with JSON auth audit support (default=auto). This requires
    	    the jansson devel package.
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    
    Autobuild-User(master):  <bbaumbach at samba.org>
    Autobuild-Date(master): Wed Apr 18 15:25:42 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 auth/wscript           | 31 +++++++++++++++++++++++++++++++
 auth/wscript_configure | 16 ----------------
 wscript                |  2 ++
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 auth/wscript
 delete mode 100644 auth/wscript_configure


Changeset truncated at 500 lines:

diff --git a/auth/wscript b/auth/wscript
new file mode 100644
index 0000000..6b769c5
--- /dev/null
+++ b/auth/wscript
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+import Logs, Options, Utils
+import samba3
+
+def set_options(opt):
+    help = ("Build with JSON auth audit support (default=auto). "
+            "This requires the jansson devel package.")
+
+    opt.SAMBA3_ADD_OPTION('json-audit', default=None, help=(help))
+
+    return
+
+def configure(conf):
+    conf.SET_TARGET_TYPE('json-audit', '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 == True:
+            conf.fatal('JSON support requested, but no suitable jansson '
+                       'library found')
+        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")
+
diff --git a/auth/wscript_configure b/auth/wscript_configure
deleted file mode 100644
index 9d930ba..0000000
--- a/auth/wscript_configure
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-
-import Options, Utils
-
-conf.SET_TARGET_TYPE('jansson', 'EMPTY')
-
-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') and \
-   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')
diff --git a/wscript b/wscript
index 0985aa9..b45146c 100644
--- a/wscript
+++ b/wscript
@@ -35,6 +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/replace')
     opt.RECURSE('dynconfig')
     opt.RECURSE('packaging')
@@ -205,6 +206,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('source4/lib/tls')
     conf.RECURSE('source4/dsdb/samdb/ldb_modules')
     conf.RECURSE('source4/ntvfs/sysdep')


-- 
Samba Shared Repository