Attachment 4728 Details for Bug 6742 – Do not build talloctort if using an external talloc

[patch] Do not build talloctort if using an external talloc

patch (text/plain), 2.35 KB, created by Matt Kraai (mail address dead) on 2009-09-21 18:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Kraai (mail address dead)

Created: 2009-09-21 18:39:14 UTC

Size: 2.35 KB

patch

obsolete

>diff --git a/source3/Makefile.in b/source3/Makefile.in
>old mode 100644
>new mode 100755
>index 6ac9571..b3eb2f8
>--- a/source3/Makefile.in
>+++ b/source3/Makefile.in
>@@ -212,7 +212,7 @@ 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_TALLOCTORT@ bin/replacetort@EXEEXT@ \
> 	bin/tdbtorture@EXEEXT@ \
> 	bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@
> 
>@@ -220,7 +220,7 @@ 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@ \
>+	@BIN_TALLOCTORT@ bin/replacetort@EXEEXT@ \
> 	bin/log2pcap@EXEEXT@ \
> 	bin/vlp@EXEEXT@ bin/smbiconv@EXEEXT@ \
> 	bin/dbwrap_tool@EXEEXT@
>@@ -1276,7 +1276,7 @@ samba3-idl::
> #####################################################################
> 
> 
>-everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
>+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter @TALLOCTORT@ replacetort smbconftort modules torture \
> 	$(EVERYTHING_PROGS)
> 
> .SUFFIXES:
>diff --git a/source3/configure.in b/source3/configure.in
>old mode 100644
>new mode 100755
>index 74012ed..dde0c6c
>--- a/source3/configure.in
>+++ b/source3/configure.in
>@@ -4750,6 +4750,10 @@ then
> 		LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
> 	done
> 	AC_SUBST(LIBTALLOC_OBJ0)
>+	BIN_TALLOCTORT="bin/talloctort"
>+	AC_SUBST(BIN_TALLOCTORT)
>+	TALLOCTORT="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`

Flags:

metze: review+

Actions: View

Attachments on bug 6742: 4723 | 4725 | 4728