From: Noel Power <noel.power@suse.com>
Date: Thu, 8 May 2025 19:19:54 +0000 (+0100)
Subject: wafsamba: Adjust for waf 2.1.5, add default for '--with/without-json'
X-Git-Tag: tevent-0.17.0~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=411026a3fbf13971fe48111fc90a497da752cb54;p=thirdparty%2Fsamba.git

wafsamba: Adjust for waf 2.1.5, add default for '--with/without-json'

With argparse we need to specify a default for in order to correctly
handle conflicting values for with/without-json

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/wscript b/wscript
index a6013fcf442..7ce8cb875a0 100644
--- a/wscript
+++ b/wscript
@@ -139,7 +139,7 @@ def options(opt):
     # enable options related to building python extensions
 
     opt.add_option('--with-json',
-                   action='store_true', dest='with_json',
+                   action='store_true', dest='with_json', default=True,
                    help=("Build with JSON support (default=True). This "
                          "requires the jansson development headers."))
     opt.add_option('--without-json',