summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-11 22:18:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-11 16:00:38 +0200
commitd271bf8dc2d37453e84ceea86a5cc70bef22d6d7 (patch)
treeed3b631722d67008afe6b7a06557f270d4248a3f
parentdba2ed9ac1710aff2ecc3e9f9463b786e90cd9e3 (diff)
downloadsamba-d271bf8dc2d37453e84ceea86a5cc70bef22d6d7.tar.gz
samba-d271bf8dc2d37453e84ceea86a5cc70bef22d6d7.tar.bz2
samba-d271bf8dc2d37453e84ceea86a5cc70bef22d6d7.zip
lib/tdb_compat: Do not define BUILD_TDB2 if we are not building tdb2
The simple fact that this was defined at all, even to false, caused some of the tdb2 build code to run. Andrew Bartlett
-rw-r--r--lib/tdb_compat/wscript4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/tdb_compat/wscript b/lib/tdb_compat/wscript
index 574e67e8ef..9e36ced2bc 100644
--- a/lib/tdb_compat/wscript
+++ b/lib/tdb_compat/wscript
@@ -7,9 +7,7 @@ def set_options(opt):
opt.RECURSE('lib/tdb')
def configure(conf):
- conf.env.BUILD_TDB2 = getattr(Options.options, 'BUILD_TDB2', False)
-
- if conf.env.BUILD_TDB2:
+ if getattr(Options.options, 'BUILD_TDB2', False):
conf.RECURSE('lib/tdb2')
else:
conf.RECURSE('lib/tdb')