diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 18:40:34 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 11:18:36 +0200 |
| commit | 985e83ef520da68a60899f0ad977cb28a77b8cbe (patch) | |
| tree | 4da2f88a0879b86ada629441dc79f67be17b7a29 /buildtools | |
| parent | 5eecc854236f0b943aaa89e0c3a46f9fbd208ca9 (diff) | |
| download | samba-985e83ef520da68a60899f0ad977cb28a77b8cbe.tar.gz samba-985e83ef520da68a60899f0ad977cb28a77b8cbe.tar.bz2 samba-985e83ef520da68a60899f0ad977cb28a77b8cbe.zip | |
tdb2: tie it into build process if --enable-tdb2-breaks-compat
This is simplistic. We need to support making TDB2 a standalone library,
but for now, we simply built it in-tree.
Once we have tdb1 compatibility in tdb2, we can rename this option to
--enable-tdb2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index d73fa3a829..c11e7d8f2a 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -57,8 +57,12 @@ def s3_fix_kwargs(bld, kwargs): '../source4/heimdal/lib/gssapi', '../source4/heimdal_build' ] - if not bld.CONFIG_SET('USING_SYSTEM_TDB'): - extra_includes += [ '../lib/tdb/include' ] + if bld.CONFIG_SET('BUILD_TDB2'): + if not bld.CONFIG_SET('USING_SYSTEM_TDB2'): + extra_includes += [ '../lib/tdb2' ] + else: + if not bld.CONFIG_SET('USING_SYSTEM_TDB'): + extra_includes += [ '../lib/tdb/include' ] if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): extra_includes += [ '../lib/tevent' ] |