From: Andreas Schneider <asn@samba.org>
Date: Thu, 8 May 2025 19:33:52 +0000 (+0100)
Subject: dynconfig/wscript: Adjust default cleanup for waf 2.1.5
X-Git-Tag: tevent-0.17.0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e504e022d04d2a3c7a436a69dc106736d7c7287;p=thirdparty%2Fsamba.git

dynconfig/wscript: Adjust default cleanup for waf 2.1.5

Using waf 2.1.5 parser.defaults no longer exists (that's part of
the optparse module and waf 2.1.5 uses argparse)
This patch adjusts the default cleanup for argparse.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/dynconfig/wscript b/dynconfig/wscript
index c338fd34888..2d7d79006fd 100644
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -302,8 +302,7 @@ def options(opt):
         option = opt.parser.get_option(k)
         if option:
             opt.parser.remove_option(k)
-    del opt.parser.defaults['PRIVATELIBDIR']
-    del opt.parser.defaults['MODULESDIR']
+    opt.parser.set_defaults(PRIVATELIBDIR=None, MODULESDIR=None)
 
     # get all the basic GNU options from the gnu_dirs tool