Attachment 4723 Details for Bug 6742 – Patch for v3-4

[patch] Patch for v3-4

tmp.diff (text/plain), 2.34 KB, created by Stefan Metzmacher on 2009-09-20 12:19:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2009-09-20 12:19:12 UTC

Size: 2.34 KB

patch

obsolete

>From 258bc9bd60cc6ce5c11ff9ba24db0229ed6980f6 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sun, 20 Sep 2009 19:14:51 +0200
>Subject: [PATCH] s3:build: only build talloctort if we build talloc
>
>This should fix bug #6742.
>
>metze
>---
> source3/Makefile.in                   |    6 +++---
> source3/configure.in                  |    2 ++
> source3/script/tests/test_local_s3.sh |    6 ++++--
> 3 files changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/source3/Makefile.in b/source3/Makefile.in
>index 4001eda..2c1fc6d 100644
>--- a/source3/Makefile.in
>+++ b/source3/Makefile.in
>@@ -212,15 +212,15 @@ BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
> TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
> 	bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
> 	bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
>-	bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
>+	bin/pdbtest@EXEEXT@ bin/replacetort@EXEEXT@ \
> 	bin/tdbtorture@EXEEXT@ \
>-	bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@
>+	bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@ @TALLOCTORT@
> 
> BIN_PROGS = @EXTRA_BIN_PROGS@ \
> 	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
> 
> EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
>-	bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
>+	@TALLOCTORT@ bin/replacetort@EXEEXT@ \
> 	bin/log2pcap@EXEEXT@ \
> 	bin/vlp@EXEEXT@ bin/smbiconv@EXEEXT@ \
> 	bin/dbwrap_tool@EXEEXT@
>diff --git a/source3/configure.in b/source3/configure.in
>index 892b836..97886c8 100644
>--- a/source3/configure.in
>+++ b/source3/configure.in
>@@ -4750,6 +4750,8 @@ then
> 		LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
> 	done
> 	AC_SUBST(LIBTALLOC_OBJ0)
>+	TALLOCTORT="bin/talloctort"
>+	AC_SUBST(TALLOCTORT)
> else
> 	LIBTALLOC_LIBS="${TALLOC_LIBS}"
> fi
>diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
>index 1840779..79e4848 100755
>--- a/source3/script/tests/test_local_s3.sh
>+++ b/source3/script/tests/test_local_s3.sh
>@@ -16,8 +16,10 @@ incdir=`dirname $0`
> 
> failed=0
> 
>-testit "talloctort" $VALGRIND $BINDIR/talloctort || \
>-    failed=`expr $failed + 1`
>+test -x $BINDIR/talloctort && {
>+	testit "talloctort" $VALGRIND $BINDIR/talloctort || \
>+	    failed=`expr $failed + 1`
>+}
> 
> testit "replacetort" $VALGRIND $BINDIR/replacetort || \
>     failed=`expr $failed + 1`
>-- 
>1.5.4.3
>

Actions: View

Attachments on bug 6742: 4723 | 4725 | 4728