lib/tdb_compat: Do not define BUILD_TDB2 if we are not building tdb2
authorAndrew Bartlett <abartlet@samba.org>
Wed, 11 Apr 2012 12:18:34 +0000 (22:18 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 11 Apr 2012 14:00:38 +0000 (16:00 +0200)
The simple fact that this was defined at all, even to false, caused some
of the tdb2 build code to run.

Andrew Bartlett

lib/tdb_compat/wscript

index 574e67e8ef4929ed4de7b62134f30c379adb93b4..9e36ced2bc8cf993cf628cd49b5d7b62ba40028c 100644 (file)
@@ -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')