waf: Rename some BUNDLED_ functios to PRIVATE_.

[nivanova/samba-autobuild/.git] / lib / tdb / wscript

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 94f85cd708414e1e83b245a7522feaf95f58c868..37af34c2f5cd1ca6589c495dbd523f525f54df6d 100644 (file)
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tdb'
-VERSION = '1.2.6'
+VERSION = '1.2.7'
 
 blddir = 'bin'
 
@@ -19,7 +19,7 @@ samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextension='tdb')
+    opt.PRIVATE_EXTENSION_DEFAULT('tdb', noextension='tdb')
     opt.RECURSE('lib/replace')
     if opt.IN_LAUNCH_DIR():
         opt.add_option('--disable-python',
@@ -36,6 +36,8 @@ def configure(conf):
         if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
                                      implied_deps='replace'):
             conf.define('USING_SYSTEM_TDB', 1)
+            if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
+                conf.define('USING_SYSTEM_PYTDB', 1)
 
     conf.env.disable_python = getattr(Options.options, 'disable_python', False)
 
@@ -68,7 +70,8 @@ def build(bld):
                           abi_file='ABI/tdb-%s.sigs' % VERSION,
                           abi_match='tdb_*',
                           hide_symbols=True,
-                          vnum=VERSION, is_bundled=not bld.env.standalone_tdb)
+                          vnum=VERSION,
+                          private_library=not bld.env.standalone_tdb)
 
         bld.SAMBA_BINARY('tdbtorture',
                          'tools/tdbtorture.c',
@@ -92,13 +95,13 @@ def build(bld):
                          'tools/tdbtool.c',
                          'tdb', manpages='manpages/tdbtool.8')
 
-    s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4
-
-    bld.SAMBA_PYTHON('pytdb',
-                     'pytdb.c',
-                     deps='tdb',
-                     enabled=not bld.env.disable_python,
-                     realname='tdb.so')
+    if not bld.CONFIG_SET('USING_SYSTEM_PYTDB'):
+        bld.SAMBA_PYTHON('pytdb',
+                         'pytdb.c',
+                         deps='tdb',
+                         enabled=not bld.env.disable_python,
+                         realname='tdb.so',
+                         cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
 
     if bld.env.standalone_tdb:
         bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
@@ -108,9 +111,11 @@ def build(bld):
 
 def test(ctx):
     '''run tdb testsuite'''
-    import Utils
+    import Utils, samba_utils
     cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture')
-    os.system(cmd)
+    ret = samba_utils.RUN_COMMAND(cmd)
+    print("testsuite returned %d" % ret)
+    sys.exit(ret)
 
 def dist():
     '''makes a tarball for distribution'''