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 /lib/tdb_compat/wscript | |
| 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 'lib/tdb_compat/wscript')
| -rw-r--r-- | lib/tdb_compat/wscript | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/tdb_compat/wscript b/lib/tdb_compat/wscript index 9e36ced2bc..5f33f6d70b 100644 --- a/lib/tdb_compat/wscript +++ b/lib/tdb_compat/wscript @@ -3,22 +3,15 @@ import Options def set_options(opt): - opt.RECURSE('lib/tdb2') opt.RECURSE('lib/tdb') def configure(conf): - if getattr(Options.options, 'BUILD_TDB2', False): - conf.RECURSE('lib/tdb2') - else: - conf.RECURSE('lib/tdb') + conf.RECURSE('lib/tdb') conf.RECURSE('lib/ccan') def build(bld): bld.RECURSE('lib/ccan') - if bld.env.BUILD_TDB2: - bld.RECURSE('lib/tdb2') - else: - bld.RECURSE('lib/tdb') + bld.RECURSE('lib/tdb') bld.SAMBA_LIBRARY('tdb_compat', source='tdb_compat.c', deps='replace tdb ccan', |