Use new common function.

[mat/samba.git] / wscript

diff --git a/wscript b/wscript
index e77d35a07af2a5bfe02e9ba376c743131e03fdb0..727374dee2a99565a33d06dc1fbaebcae7699736 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -132,6 +132,8 @@ def configure(conf):
     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/zlib')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
@@ -239,7 +241,18 @@ def wafdocs(ctx):
 
 def dist():
     '''makes a tarball for distribution'''
-    samba_version.load_version(env=None)
+    sambaversion = samba_version.load_version(env=None)
+
+    if sambaversion.IS_SNAPSHOT:
+        # write .distversion file and add to tar
+        f = '.distversion'
+        distversionf = open(f, 'w')
+        for field in sambaversion.vcs_fields:
+            distveroption = field + '=' + str(sambaversion.vcs_fields[field])
+            distversionf.write(distveroption + '\n')
+        distversionf.close()
+        samba_dist.DIST_FILES('.distversion')
+
     samba_dist.dist()
 
 def distcheck():
@@ -247,7 +260,7 @@ def distcheck():
     samba_version.load_version(env=None)
     import Scripting
     d = Scripting.distcheck
-    d(subdir='source4')
+    d()
 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''