[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  ed39e9b... s3: Work around dependency bug in Samba 4 waf build in merged build.
      from  aa8d91a... libwbclient: Fix a fd-leak at dlclose-time

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ed39e9b67f38312b6786172e80b4d7057dbd513a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon May 10 14:48:41 2010 +0200

    s3: Work around dependency bug in Samba 4 waf build in merged build.

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c6986ed..1a4456d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3217,13 +3217,14 @@ clean_libnetapi_examples:
 ../source4/configure: ../buildtools/scripts/configure.waf
 	cd ../source4 && ./autogen.sh
 
-samba4-configure:
-	@$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure --prefix="$(prefix)" )
+samba4-configure: ../source4/configure
+	@$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture   
+	cd ../source4 && ../buildtools/bin/waf build --targets=asn1_compile,compile_et
+	cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
 	cp ../source4/bin/smbtorture bin/smbtorture4
 
 .PHONY: bin/smbtorture4


-- 
Samba Shared Repository