diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:04 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
| commit | 6244f668a34279e6da62213333dfb32c3ccdb17d (patch) | |
| tree | 0dd495f4d03e57e8a5710d2edea84c137d4b4aee /buildtools | |
| parent | 5bad913938daca4ae3020653690701db83826954 (diff) | |
| download | samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.gz samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.bz2 samba-6244f668a34279e6da62213333dfb32c3ccdb17d.zip | |
TDB2: make SAMBA use tdb1 again for the moment.
Otherwise the following surgery will break the SAMBA build and testsuite.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index b6a9f1bd3f..476d8fc9e4 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -61,18 +61,11 @@ def s3_fix_kwargs(bld, kwargs): '../source4/heimdal_build', '../bin/default/source4/heimdal/lib/asn1' ] - if bld.CONFIG_SET('BUILD_TDB2'): - if bld.CONFIG_SET('USING_SYSTEM_TDB2'): - (tdb2_includes, tdb2_ldflags, tdb2_cpppath) = library_flags(bld, 'tdb') - extra_includes += tdb2_cpppath - else: - extra_includes += [ '../lib/tdb2' ] + if bld.CONFIG_SET('USING_SYSTEM_TDB'): + (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb') + extra_includes += tdb_cpppath else: - if bld.CONFIG_SET('USING_SYSTEM_TDB'): - (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb') - extra_includes += tdb_cpppath - else: - extra_includes += [ '../lib/tdb/include' ] + extra_includes += [ '../lib/tdb/include' ] if bld.CONFIG_SET('USING_SYSTEM_TEVENT'): (tevent_includes, tevent_ldflags, tevent_cpppath) = library_flags(bld, 'tevent') |