s3:smbXsrv_open: add function smbXsrv_open_cleanup()

[metze/samba/wip.git] / wscript

diff --git a/wscript b/wscript
old mode 100755 (executable)
new mode 100644 (file)
index 1e76298..dad54d1
--- a/wscript
+++ b/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
 
 srcdir = '.'
 blddir = 'bin'
@@ -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
@@ -82,13 +78,10 @@ def configure(conf):
 
     conf.RECURSE('lib/replace')
 
-    conf.find_program('python', var='PYTHON', mandatory=True)
     conf.find_program('perl', var='PERL', mandatory=True)
     conf.find_program('xsltproc', var='XSLTPROC')
 
-    # enable tool to build python extensions
-    conf.check_tool('python')
-    conf.check_python_version((2,4,2))
+    conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
     conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
 
     if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
@@ -123,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')
@@ -237,6 +226,16 @@ def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 
+    os.system(srcdir + "/release-scripts/build-manpages-nogit")
+    samba_dist.DIST_FILES('bin/docs:docs', extend=True)
+
+    os.system(srcdir + "/source3/autogen.sh")
+    samba_dist.DIST_FILES('source3/configure', extend=True)
+    samba_dist.DIST_FILES('source3/autoconf', extend=True)
+    samba_dist.DIST_FILES('source3/include/autoconf', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/configure', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/module_config.h.in', extend=True)
+
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar
         if not os.path.isdir(blddir):