From 1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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 --- source4/lib/ldb/wscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index ddd5e138c4..4e8b80515d 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -14,7 +14,10 @@ for d in buildtools.split(): break sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba +import wafsamba, samba_dist + +samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc + lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''') LIBTDB_DIR= srcdir + '/lib/tdb' @@ -28,8 +31,6 @@ def set_options(opt): opt.recurse(LIBTEVENT_DIR) def configure(conf): - conf.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc - lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''') conf.sub_config(LIBTDB_DIR) conf.sub_config(LIBTEVENT_DIR) conf.sub_config(LIBPOPT_DIR) -- cgit