From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 May 2010 17:30:46 +0000 (+0200)
Subject: s3:build: build smbtorture4 when the merged build is selected
X-Git-Tag: samba-3.6.0pre1~2029
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6427484f84e3437bdabb90a2672ec7c037cedf0d;p=thirdparty%2Fsamba.git

s3:build: build smbtorture4 when the merged build is selected

metze
---

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 06e288c7fad..d661b94bfe5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1355,7 +1355,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@
 
 gpext_modules:: $(GPEXT_MODULES)
 
-torture:: SHOWFLAGS basics $(TORTURE_PROGS) 
+torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@
 
 smbtorture : SHOWFLAGS bin/smbtorture@EXEEXT@
 
@@ -3225,7 +3225,6 @@ samba4-configure: ../source4/configure
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-	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
 
diff --git a/source3/configure.in b/source3/configure.in
index 765bac7d955..04a1c05b5b0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6680,6 +6680,8 @@ if test x$enable_merged_build = xyes; then
 	AC_SUBST(smbtorture4_path)
 	AC_SUBST(smbtorture4_option)
 	USESHARED="$saved_USESHARED"
+	SMBTORTURE4="bin/smbtorture4"
+	AC_SUBST(SMBTORTURE4)
 fi
 
 AC_SUBST(ZLIB_LIBS)