From 41333f92d0c78e44a524f2248f5ae641ad59abf3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 11 Apr 2013 17:12:16 +0930 Subject: ntdb: remove --disable-ntdb. Remove DISABLE_NTDB option, and --disable-ntdb from waf build. This just means that it will always get built: it isn't used by default yet. Signed-off-by: Rusty Russell Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Apr 13 02:01:02 CEST 2013 on sn-devel-104 --- wscript | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4944a72bc33..dad54d1c6cb 100644 --- a/wscript +++ b/wscript @@ -58,10 +58,6 @@ def set_options(opt): gr = opt.option_group('developer options') - opt.add_option('--disable-ntdb', - help=("disable ntdb"), - action="store_true", dest='disable_ntdb', default=False) - opt.tool_options('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -120,11 +116,7 @@ def configure(conf): conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') conf.RECURSE('lib/ccan') - conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False) - if not Options.options.disable_ntdb: - conf.RECURSE('lib/ntdb') - else: - conf.DEFINE('DISABLE_NTDB', 1) + conf.RECURSE('lib/ntdb') conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') -- cgit