[SCM] Samba Shared Repository - branch master updated

[Stefan (metze) Metzmacher]

Hi Jelmer,

> - Log -----------------------------------------------------------------
> commit 8c017022dbb78966589fa98e03dea01d91d003b0
> Author: Jelmer Vernooij <jelmer at samba.org>
> Date:   Mon May 31 13:55:17 2010 +0200
> 
>     talloc: Don't set is_bundled for standalone build.
> 
> commit 151e239bcf2860411527a953d627b2d724c0a57e
> Author: Jelmer Vernooij <jelmer at samba.org>
> Date:   Mon May 31 13:51:49 2010 +0200
> 
>     ldb/waf: Fix build with system and bundled ldb.

Please test your changes without system libraries,
and make sure it still works.

Currently make bin/smbtorture4 in the merged build gets this:
http://pastie.org/985637

(I assume the s4 build will have the same problem)

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-cvs/attachments/20100531/66be02ed/attachment.pgp>