diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 23:22:24 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 17:37:51 +1000 |
| commit | 1dfc6fa558e7735341a7095aa46e5568a4f56cfe (patch) | |
| tree | 80c2474135ebb6eedb8287b2a469e3dd5754a68c /source3/wscript_build | |
| parent | 521687be0d4bcd6326417696fabdce6506824b99 (diff) | |
| download | samba-1dfc6fa558e7735341a7095aa46e5568a4f56cfe.tar.gz samba-1dfc6fa558e7735341a7095aa46e5568a4f56cfe.tar.bz2 samba-1dfc6fa558e7735341a7095aa46e5568a4f56cfe.zip | |
s4-param Add hook between Samba3 and Samba4 loadparm systems.
In the top level build, this allows calls to code that requires a
lpcfg_ style loadparm_context, while using the global parameters
loaded from the source3 loadparm code.
Andrew Bartlett
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 4fd7a7b556..b30c204ab3 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -737,9 +737,15 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', source=PARAM_UTIL_SRC, deps='samba-util-common') +if bld.env.toplevel_build: + bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', + source='param/loadparm_ctx.c', + deps='''s3_param_h PARAM_WITHOUT_REG''', + vars=locals()) + bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn ldap lber''', + deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX''', vars=locals()) bld.SAMBA3_SUBSYSTEM('param', @@ -1410,7 +1416,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') - + bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', '') ########################## INCLUDES ################################# |