build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries

[sfrench/samba-autobuild/.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index f254e55654b93e0b6127f8b20d0d76cd514bc496..6947b1d0b806750dbf3e4cc60e24ff8315140a16 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.1.15'
+VERSION = '2.1.16'
 
 import os
 import sys
@@ -57,16 +57,8 @@ def configure(conf):
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 
-    # We need to set everything non-python up before here, because
-    # SAMBA_CHECK_PYTHON makes a copy of conf and we need it set up correctly
-
-    if not conf.env.disable_python:
-        # also disable if we don't have the python libs installed
-        conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
-        conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-        if not conf.env.HAVE_PYTHON_H:
-            Logs.warn('Disabling pytalloc-util as python devel libs not found')
-            conf.env.disable_python = True
+    conf.SAMBA_CHECK_PYTHON()
+    conf.SAMBA_CHECK_PYTHON_HEADERS()
 
     if not conf.env.standalone_talloc:
         if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
@@ -81,13 +73,6 @@ def configure(conf):
             if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
                                                  implied_deps='talloc replace'):
                 using_system_pytalloc_util = False
-            # We need to get a pytalloc-util for all the python versions
-            # we are building for
-            if conf.env['EXTRA_PYTHON']:
-                name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
-                if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-                                                     implied_deps='talloc replace'):
-                    using_system_pytalloc_util = False
 
         if using_system_pytalloc_util:
             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
@@ -140,10 +125,9 @@ def build(bld):
                           manpages='man/talloc.3')
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'):
-        for env in bld.gen_python_environments(['PKGCONFIGDIR']):
-            name = bld.pyembed_libname('pytalloc-util')
+        name = bld.pyembed_libname('pytalloc-util')
 
-            bld.SAMBA_LIBRARY(name,
+        bld.SAMBA_LIBRARY(name,
                 source='pytalloc_util.c',
                 public_deps='talloc',
                 pyembed=True,
@@ -156,18 +140,18 @@ def build(bld):
                 pc_files='pytalloc-util.pc',
                 enabled=bld.PYTHON_BUILD_IS_ENABLED()
                 )
-            bld.SAMBA_PYTHON('pytalloc',
-                            'pytalloc.c',
-                            deps='talloc ' + name,
-                            enabled=bld.PYTHON_BUILD_IS_ENABLED(),
-                            realname='talloc.so')
-
-            bld.SAMBA_PYTHON('test_pytalloc',
-                            'test_pytalloc.c',
-                            deps=name,
-                            enabled=bld.PYTHON_BUILD_IS_ENABLED(),
-                            realname='_test_pytalloc.so',
-                            install=False)
+        bld.SAMBA_PYTHON('pytalloc',
+                         'pytalloc.c',
+                         deps='talloc ' + name,
+                         enabled=bld.PYTHON_BUILD_IS_ENABLED(),
+                         realname='talloc.so')
+
+        bld.SAMBA_PYTHON('test_pytalloc',
+                         'test_pytalloc.c',
+                         deps=name,
+                         enabled=bld.PYTHON_BUILD_IS_ENABLED(),
+                         realname='_test_pytalloc.so',
+                         install=False)
 
 
 def test(ctx):