diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-24 11:58:47 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-26 10:17:18 -0700 |
| commit | 1ae0981ce8d9786608714d6e7a9e31f09d765b71 (patch) | |
| tree | 8ee00524ba713fcc49018001df8655fa8b2b28c7 | |
| parent | 50256c01d061c6d73bb2d8ee2c60785d58748e6c (diff) | |
| download | samba-1ae0981ce8d9786608714d6e7a9e31f09d765b71.tar.gz samba-1ae0981ce8d9786608714d6e7a9e31f09d765b71.tar.bz2 samba-1ae0981ce8d9786608714d6e7a9e31f09d765b71.zip | |
talloc: Move pytalloc to lib/talloc.
| -rw-r--r-- | lib/talloc/wscript | 8 | ||||
| -rw-r--r-- | source4/scripting/python/wscript_build | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 3cf5ade2c8..1f7b7908a0 100644 --- 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 7f56afd592..c75647689f 100644 --- 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', |