Make --enable-s3build the default in the top level build?

[Andrew Bartlett]

On Wed, 2011-04-20 at 16:22 +1000, Andrew Bartlett wrote:
> I was wondering if it would be OK to make --enable-s3build the default
> (no longer optional) in the top level build?  I've been building with it
> for quite some time, and it seems to 'just work'.
> 
> This option enables a waf build of all of Samba, producing binaries for
> 'Samba3' and 'Samba4' that are linked to common shared libraries.  It is
> still a work in progress, but pending only the kerberos fixes I'm
> currently working out with Simo, it passes a combined make test. 
> 
> The combined test is why I ask:  We currently have 4 build systems in
> Samba (autoconf-s3, waf-s3, toplevel, toplevel-s3build), and I think
> this is too many - I would like to reduce this to 3.  
> 
> In particular, what I'm hoping is that I can write tests that test
> Samba3 and Samba4 interactions without the complexity of them being
> conditional. 
> 
> Take for example the test metze and I have been working on to test
> Samba3's winbind in a Samba4 domain.  I don't want to have to make this
> important test conditional - instead I want to ensure we get this
> working, and then we keep this working. 
> 
> This won't impact the s3-waf build, or the autoconf build - any combined
> tests will be added to the top level build only.  

To be specific about the proposal, attached are the patches I propose to
apply.  It changes the default, --disable-s3build is used for building
smbtorture4 to avoid conflicts between the autoconf in-tree files under
source3/ and the waf build. 

This also addresses Brad's undefined symbol issue by essentially
eliminating samba-util-common from the top level build.  Hopefully we
can eliminate it from the s3-waf build as well, but that will still take
some work. 

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lib-util-Define-samba-util-common-only-for-s3-waf.patch
Type: text/x-patch
Size: 3086 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20110421/dac1d7eb/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-selftest-Make-combined-test-the-default-when-s3build.patch
Type: text/x-patch
Size: 869 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20110421/dac1d7eb/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-build-Invert-enable-s3build-into-disable-s3build.patch
Type: text/x-patch
Size: 2197 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20110421/dac1d7eb/attachment-0002.bin>