diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2012-06-21 16:44:55 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2012-06-21 19:59:57 +0200 |
commit | 7b43053ad6d1ee00895f592e7524c8591894144b (patch) | |
tree | ab59c05c8ea6c5764e793dd5f409812c272e5271 | |
parent | cbd660d01381465a35dc696b6a135de22f7682e6 (diff) | |
download | samba-7b43053ad6d1ee00895f592e7524c8591894144b.tar.gz samba-7b43053ad6d1ee00895f592e7524c8591894144b.tar.bz2 samba-7b43053ad6d1ee00895f592e7524c8591894144b.zip |
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
-rw-r--r-- | lib/ntdb/wscript | 1 | ||||
-rwxr-xr-x | wscript | 9 | ||||
-rwxr-xr-x | wscript_build | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lib/ntdb/wscript b/lib/ntdb/wscript index ff8f24eae8..f034631058 100644 --- 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"), @@ -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 dc06b647b8..b671699344 100755 --- 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') |