From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 11 Apr 2012 12:18:34 +0000 (+1000)
Subject: lib/tdb_compat: Do not define BUILD_TDB2 if we are not building tdb2
X-Git-Tag: ldb-1.1.6~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d271bf8dc2d37453e84ceea86a5cc70bef22d6d7;p=thirdparty%2Fsamba.git

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
---

diff --git a/lib/tdb_compat/wscript b/lib/tdb_compat/wscript
index 574e67e8ef4..9e36ced2bc8 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')