lib-subunit: fixed build on systems without subunit devel library

Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>

diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index 7830b3a039bc9f11cbd0824301da2e4797616ada..a3ba60592db79f85aa564b738b67fffc6a6845c3 100644 (file)
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-
 bld.SAMBA_LIBRARY('torture',
-       source='torture.c subunit.c ../subunit/c/lib/child.c',
+       source='torture.c subunit.c',
        vnum='0.0.1',
        pc_files='torture.pc',
-       public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc tevent',
+       public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc tevent subunit',
        public_headers='torture.h'
        )
-

diff --git a/source4/wscript_build b/source4/wscript_build
index 090c914ae73ea9b6c36ff0b8642c5bec497e836c..6b9fc981e99d274607ab319093e17ca514853e01 100644 (file)
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -99,6 +99,7 @@ bld.RECURSE('client')
 bld.RECURSE('libcli')
 bld.RECURSE('../libcli/smb')
 bld.RECURSE('../libcli/cldap')
+bld.RECURSE('../lib/subunit/c')
 bld.RECURSE('kdc')
 bld.RECURSE('../lib/smbconf')
 bld.RECURSE('../lib/async_req')