diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-05-13 19:30:46 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-05-13 19:42:25 +0200 |
| commit | 6427484f84e3437bdabb90a2672ec7c037cedf0d (patch) | |
| tree | 048353b5550056b8fe5587ab30c41e65b330554b /source3 | |
| parent | b4cfa3b9e419268e99e54f4ecb8a4f7ad007f218 (diff) | |
| download | samba-6427484f84e3437bdabb90a2672ec7c037cedf0d.tar.gz samba-6427484f84e3437bdabb90a2672ec7c037cedf0d.tar.bz2 samba-6427484f84e3437bdabb90a2672ec7c037cedf0d.zip | |
s3:build: build smbtorture4 when the merged build is selected
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/configure.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 06e288c7fa..d661b94bfe 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 765bac7d95..04a1c05b5b 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) |