From 8f062f4a0f781b351e361ce07d0701f312069851 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Mar 2010 20:31:46 +1100
Subject: build: neater way to find libreplace and start on tevent waf build

---
 lib/tdb/wscript | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'lib/tdb/wscript')

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 4115593de6..c746af6def 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,23 +1,30 @@
+VERSION='1.2.1'
+
 srcdir = '.'
 blddir = 'build'
 
+LIBREPLACE_DIR='../replace'
+
 def set_options(opt):
-    opt.recurse('../talloc')
+    opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
-    conf.recurse('../talloc')
+    conf.sub_config(LIBREPLACE_DIR)
+    conf.SAMBA_CONFIG_H()
 
 def build(bld):
-    bld.recurse('../talloc')
+    bld.add_subdirs(LIBREPLACE_DIR)
 
-    COMMON_SOURCE = '''common/check.c common/error.c common/tdb.c common/traverse.c
-                       common/freelistcheck.c common/lock.c common/dump.c common/freelist.c
-                       common/io.c common/open.c  common/transaction.c'''
+    COMMON_SRC = bld.SUBDIR('common',
+                            '''check.c error.c tdb.c traverse.c
+                            freelistcheck.c lock.c dump.c freelist.c
+                            io.c open.c transaction.c''')
 
     bld.SAMBA_LIBRARY('tdb',
-                      COMMON_SOURCE,
-                      'replace talloc',
-                      'include')
+                      COMMON_SRC,
+                      libdeps='replace talloc',
+                      include_list='include',
+                      vnum=VERSION)
 
     bld.SAMBA_BINARY('tdbtorture',
                      'tools/tdbtorture.c',
-- 
cgit