summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-05-02 16:23:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:45 -0500
commit714a426fe579ad481aa342a8d4cfd5331a12978f (patch)
tree1a9772ea6cc7eafea947af3ecfdba3e32146f6ac
parent4bbef96aba4c0e21ca720a66b75d8f6c49a09b2d (diff)
downloadsamba-714a426fe579ad481aa342a8d4cfd5331a12978f.tar.gz
samba-714a426fe579ad481aa342a8d4cfd5331a12978f.tar.bz2
samba-714a426fe579ad481aa342a8d4cfd5331a12978f.zip
r6585: Fix socket-wrapper-enabled build for the tdb tools
(This used to be commit 93ee9cfe22b60a35bb7f7c45c4c71a31665dca45)
-rw-r--r--source3/Makefile.in15
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ade84b6bad..778ceaaa0b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -855,7 +855,7 @@ bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@
+ @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ @SOCKWRAP@
bin/editreg@EXEEXT@: $(EDITREG_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1268,15 +1268,15 @@ bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ)
+ @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) @SOCKWRAP@
bin/tdbtool@EXEEXT@: $(TDBTOOL_OBJ) bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ)
+ @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) @SOCKWRAP@
bin/tdbdump@EXEEXT@: $(TDBDUMP_OBJ) bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ)
+ @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ) @SOCKWRAP@
bin/t_strcmp@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o
$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud
@@ -1569,3 +1569,10 @@ check: check-programs
# running it. For the time being we don't build all of BIN_PROGS,
# because they're not all needed.
check-programs: bin/t_strcmp bin/t_strstr bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf
+
+test: all
+ @if test -z "$(SMB4TORTURE)"; then \
+ echo "Please set the SMB4TORTURE environment variable"; \
+ exit 1; \
+ fi
+ ./script/smb4torture.sh `pwd`/prefix-test $(SMB4TORTURE)