diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 20:18:45 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 22:29:09 -0700 |
| commit | a15a33a9a8806426955fb3cab6b798ab4173cc67 (patch) | |
| tree | 79829184c0c0aa7530a21e4f703b496d104033ce | |
| parent | 029add7e079cc9532016b49c323b52eadef25695 (diff) | |
| download | samba-a15a33a9a8806426955fb3cab6b798ab4173cc67.tar.gz samba-a15a33a9a8806426955fb3cab6b798ab4173cc67.tar.bz2 samba-a15a33a9a8806426955fb3cab6b798ab4173cc67.zip | |
torture: Use system subunit library if available.
| -rw-r--r-- | lib/subunit/c/wscript | 14 | ||||
| -rw-r--r-- | lib/torture/wscript_build | 1 | ||||
| -rw-r--r-- | source4/wscript | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/lib/subunit/c/wscript b/lib/subunit/c/wscript new file mode 100644 index 0000000000..75449121c6 --- /dev/null +++ b/lib/subunit/c/wscript @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +import Options + +def configure(conf): + if conf.CHECK_BUNDLED_SYSTEM('subunit', checkfunctions='subunit_test_start', headers='subunit/child.h'): + conf.define('USING_SYSTEM_SUBUNIT', 1) + +def build(bld): + if bld.CONFIG_SET('USING_SYSTEM_SUBUNIT'): + return + + bld.SAMBA_LIBRARY('subunit', source='lib/child.c', is_bundled=True, + includes='include') diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build index 56f17a636d..7830b3a039 100644 --- a/lib/torture/wscript_build +++ b/lib/torture/wscript_build @@ -3,7 +3,6 @@ bld.SAMBA_LIBRARY('torture', source='torture.c subunit.c ../subunit/c/lib/child.c', - includes='../subunit/c/include', vnum='0.0.1', pc_files='torture.pc', public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc tevent', diff --git a/source4/wscript b/source4/wscript index 6bf8663d6c..958c058e75 100644 --- a/source4/wscript +++ b/source4/wscript @@ -111,6 +111,7 @@ def configure(conf): conf.RECURSE('../lib/socket_wrapper') conf.RECURSE('../lib/uid_wrapper') conf.RECURSE('../lib/popt') + conf.RECURSE('../lib/subunit/c') conf.RECURSE('lib/smbreadline') conf.RECURSE('../pidl') conf.RECURSE('selftest') |