Add --disable-ntdb option for building.

Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Thu Jun 21 19:59:57 CEST 2012 on sn-devel-104

diff --git a/lib/ntdb/wscript b/lib/ntdb/wscript
index ff8f24eae89a32258676ec005db37ccbfdd89e7a..f034631058da8b6bdde8790b380083176e549361 100644 (file)
--- a/lib/ntdb/wscript
+++ b/lib/ntdb/wscript
@@ -27,6 +27,7 @@ def set_options(opt):
     opt.add_option('--valgrind-log',
                    help=("where to put the valgrind log"),
                    action="store", dest='VALGRINDLOG', default=None)
+
     if opt.IN_LAUNCH_DIR():
         opt.add_option('--disable-python',
                        help=("disable the pyntdb module"),

diff --git a/wscript b/wscript
index 9caa673fedadb026e10160ab60ef063e04f3ebb7..e77d35a07af2a5bfe02e9ba376c743131e03fdb0 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -61,6 +61,11 @@ def set_options(opt):
                    help='enable special build farm options',
                    action='store_true', dest='BUILD_FARM')
 
+    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
 
@@ -124,7 +129,9 @@ def configure(conf):
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
     conf.RECURSE('lib/ccan')
-    conf.RECURSE('lib/ntdb')
+    conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False)
+    if not Options.options.disable_ntdb:
+        conf.RECURSE('lib/ntdb')
     conf.RECURSE('lib/zlib')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')

diff --git a/wscript_build b/wscript_build
index dc06b647b85767f5e4d6bd3f1bb4d81ec486e0fc..b67169934405f8f81a83c8c0c476f9b4a5d8c997 100755 (executable)
--- a/wscript_build
+++ b/wscript_build
@@ -34,7 +34,8 @@ bld.RECURSE('lib/tevent')
 bld.RECURSE('lib/addns')
 bld.RECURSE('lib/ccan')
 bld.RECURSE('lib/tdb_compat')
-bld.RECURSE('lib/ntdb')
+if not bld.env.disable_ntdb:
+    bld.RECURSE('lib/ntdb')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')