talloc: simplifiy the logic to build talloc_testsuite in the standalone build

[rusty/samba.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index b4cb84bbd8a000edf94f5a9c38cfa8f6ac2bcd27..dd83e16a423273af472bfb2afbcca6a6e8c2f662 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.4'
+VERSION = '2.0.7'
 
 
 blddir = 'bin'
@@ -57,6 +57,7 @@ def configure(conf):
 
     if not conf.env.disable_python:
         # also disable if we don't have the python libs installed
+        conf.find_program('python', var='PYTHON')
         conf.check_tool('python')
         conf.check_python_version((2,4,2))
         conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
@@ -73,8 +74,6 @@ def build(bld):
     if bld.env.standalone_talloc:
         bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
         bld.env.TALLOC_VERSION = VERSION
-        bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
-        bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
         private_library = False
 
         # should we also install the symlink to libtalloc1.so here?
@@ -82,10 +81,15 @@ def build(bld):
                           'compat/talloc_compat1.c',
                           public_deps='talloc',
                           soname='libtalloc.so.1',
+                          pc_files=[],
+                          public_headers=[],
                           enabled=bld.env.TALLOC_COMPAT1)
 
-        if not bld.env.disable_python:
-            bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
+        bld.SAMBA_BINARY('talloc_testsuite',
+                         'testsuite_main.c testsuite.c',
+                         deps='talloc',
+                         install=False)
+
     else:
         private_library = True
 
@@ -98,33 +102,31 @@ def build(bld):
                           abi_match='talloc* _talloc*',
                           hide_symbols=True,
                           vnum=VERSION,
+                          public_headers='talloc.h',
+                          pc_files='talloc.pc',
+                          public_headers_install=not private_library,
                           private_library=private_library,
                           manpages='talloc.3')
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
-
         bld.SAMBA_LIBRARY('pytalloc-util',
             source='pytalloc_util.c',
             public_deps='talloc',
             pyext=True,
             vnum=VERSION,
+            hide_symbols=True,
+            abi_directory='ABI',
+            abi_match='pytalloc_*',
             private_library=private_library,
+            public_headers='pytalloc.h',
+            pc_files='pytalloc-util.pc'
             )
-        bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h')
         bld.SAMBA_PYTHON('pytalloc',
                          'pytalloc.c',
                          deps='talloc pytalloc-util',
                          enabled=True,
                          realname='talloc.so')
 
-    if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
-        # s4 already has the talloc testsuite builtin to smbtorture
-        bld.SAMBA_BINARY('talloc_testsuite',
-                         'testsuite_main.c testsuite.c',
-                         deps='talloc',
-                         install=False)
-
-
 def test(ctx):
     '''run talloc testsuite'''
     import Utils, samba_utils