s4-waf: move to a universal method of recursing into subdirs

[samba.git] / lib / tevent / wscript

diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index e6ef67a8d674d41ecd86d2f36033ed6cb01912de..569740e8d035b9392eb37369135cc11cc5062df9 100644 (file)
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,28 +1,39 @@
 #!/usr/bin/env python
 
+APPNAME = 'tevent'
 VERSION = '0.9.8'
 
-srcdir = '../..'
 blddir = 'bin'
 
-import sys
-sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba
+import sys, os
 
-LIBREPLACE_DIR= srcdir + '/lib/replace'
-LIBTALLOC_DIR=  srcdir + '/lib/talloc'
+# find the buildtools directory
+buildtools = 'buildtools'
+while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
+    buildtools = '../' + buildtools
+srcdir = os.path.dirname(buildtools) or '.'
+
+sys.path.insert(0, buildtools + "/wafsamba")
+
+import wafsamba, samba_dist
+
+samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
+
+LIBREPLACE_DIR= '../replace'
+LIBTALLOC_DIR=  '../talloc'
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
     opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent')
-    opt.recurse(LIBREPLACE_DIR)
-    opt.recurse(LIBTALLOC_DIR)
+    opt.RECURSE(LIBREPLACE_DIR)
+    opt.RECURSE(LIBTALLOC_DIR)
 
 def configure(conf):
-    conf.sub_config(LIBREPLACE_DIR)
-    conf.sub_config(LIBTALLOC_DIR)
+    conf.RECURSE(LIBREPLACE_DIR)
+    conf.RECURSE(LIBTALLOC_DIR)
 
-    if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION):
+    if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
+                                 onlyif='talloc', implied_deps='replace talloc'):
         conf.define('USING_SYSTEM_TEVENT', 1)
 
     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
@@ -31,8 +42,8 @@ def configure(conf):
     conf.SAMBA_CONFIG_H()
 
 def build(bld):
-    bld.BUILD_SUBDIR(LIBREPLACE_DIR)
-    bld.BUILD_SUBDIR(LIBTALLOC_DIR)
+    bld.RECURSE(LIBREPLACE_DIR)
+    bld.RECURSE(LIBTALLOC_DIR)
 
     SRC = '''tevent.c tevent_debug.c tevent_fd.c tevent_immediate.c
              tevent_queue.c tevent_req.c tevent_select.c