summaryrefslogtreecommitdiff
path: root/source3/wscript
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-04 13:08:05 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:25 +1000
commit553324bc1022635e05a683c4bec5135d845f6fea (patch)
tree7d8aa296c7e433793e47bf1227310973a4aed7e9 /source3/wscript
parent8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (diff)
downloadsamba-553324bc1022635e05a683c4bec5135d845f6fea.tar.gz
samba-553324bc1022635e05a683c4bec5135d845f6fea.tar.bz2
samba-553324bc1022635e05a683c4bec5135d845f6fea.zip
s4-waf: move to a universal method of recursing into subdirs
This works with both standalone lib builds and bundled builds
Diffstat (limited to 'source3/wscript')
-rw-r--r--source3/wscript26
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/wscript b/source3/wscript
index ac231d4ed3..6b669dbd42 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -12,11 +12,11 @@ from samba_utils import *
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.BUNDLED_EXTENSION_DEFAULT('s3')
- opt.recurse('../lib/replace')
- opt.recurse('build')
- opt.recurse('../lib/nss_wrapper')
- opt.recurse('../lib/socket_wrapper')
- opt.recurse('../lib/uid_wrapper')
+ opt.RECURSE('../lib/replace')
+ opt.RECURSE('build')
+ opt.RECURSE('../lib/nss_wrapper')
+ opt.RECURSE('../lib/socket_wrapper')
+ opt.RECURSE('../lib/uid_wrapper')
opt.add_option('--with-static-modules',
help=("Comma-separated list of names of modules to statically link in"),
@@ -45,14 +45,14 @@ def configure(conf):
conf.ADD_EXTRA_INCLUDES('#source3 #source3/include #lib/replace #lib/talloc #lib/tevent #source3/libaddns #source3/librpc')
- conf.sub_config('../lib/replace')
- conf.sub_config('build')
- conf.sub_config('../lib/tdb')
- conf.sub_config('../lib/talloc')
- conf.sub_config('../lib/tevent')
- conf.sub_config('../lib/nss_wrapper')
- conf.sub_config('../lib/socket_wrapper')
- conf.sub_config('../lib/uid_wrapper')
+ conf.RECURSE('../lib/replace')
+ conf.RECURSE('build')
+ conf.RECURSE('../lib/tdb')
+ conf.RECURSE('../lib/talloc')
+ conf.RECURSE('../lib/tevent')
+ conf.RECURSE('../lib/nss_wrapper')
+ conf.RECURSE('../lib/socket_wrapper')
+ conf.RECURSE('../lib/uid_wrapper')
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h')