From 1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 4 Apr 2010 11:00:42 +1000
Subject: s4-waf: avoid having to run waf configure before waf dist

This should be useful for building tarballs from a clean checkout
---
 lib/tdb/wscript | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/tdb')

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index c4b59e3a8f..3004c2dd92 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -15,7 +15,9 @@ for d in buildtools.split():
         break
 
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba
+import wafsamba, samba_dist
+
+samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
 
 
 LIBREPLACE_DIR= srcdir + '/lib/replace'
@@ -26,7 +28,6 @@ def set_options(opt):
     opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
-    conf.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
     conf.sub_config(LIBREPLACE_DIR)
 
     if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
-- 
cgit