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 af9a8ff6d9e4ffd394795d5ca8c5a36f89674f05..dd83e16a423273af472bfb2afbcca6a6e8c2f662 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.6'
+VERSION = '2.0.7'
 
 
 blddir = 'bin'
@@ -81,8 +81,15 @@ def build(bld):
                           'compat/talloc_compat1.c',
                           public_deps='talloc',
                           soname='libtalloc.so.1',
-                          pc_files='talloc.pc',
+                          pc_files=[],
+                          public_headers=[],
                           enabled=bld.env.TALLOC_COMPAT1)
+
+        bld.SAMBA_BINARY('talloc_testsuite',
+                         'testsuite_main.c testsuite.c',
+                         deps='talloc',
+                         install=False)
+
     else:
         private_library = True
 
@@ -96,6 +103,7 @@ def build(bld):
                           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')
@@ -119,14 +127,6 @@ def build(bld):
                          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