talloc: Move pytalloc to lib/talloc.

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3cf5ade2c8ffdbfa0780b9306a97ed58bcf7aac0..1f7b7908a02be534e50099e8e74039a96ab13b78 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -82,6 +82,14 @@ def build(bld):
                           private_library=private_library,
                           manpages='talloc.3')
 
+    if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'):
+
+        bld.SAMBA_SUBSYSTEM('PYTALLOC',
+            source='pytalloc.c',
+            public_deps='EXT_LIB_PYTHON talloc',
+            pyext=True,
+            )
+
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
         bld.SAMBA_BINARY('talloc_testsuite',

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 7f56afd5928662b728dff6b6459ef5a71d93e82f..c75647689f2c9e5f93378396911dbf0af73e4a5c 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -16,13 +16,6 @@ bld.SAMBA_SUBSYSTEM('LIBPYTHON',
        )
 
 
-bld.SAMBA_SUBSYSTEM('PYTALLOC',
-       source='../../../lib/talloc/pytalloc.c',
-       public_deps='EXT_LIB_PYTHON talloc',
-       pyext=True,
-       )
-
-
 bld.SAMBA_PYTHON('python_uuid',
        source='uuidmodule.c',
        deps='ndr',