summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-24 23:53:38 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-24 14:40:16 +0100
commitf10dd12b1474bafaf2906b10ed960d1afc92f91c (patch)
tree5be632bd22cbfe7040a33889f3ee23c48dc274e9 /source3
parentea1889d4b58e80c12de87f3987da49e4da1e9717 (diff)
downloadsamba-f10dd12b1474bafaf2906b10ed960d1afc92f91c.tar.gz
samba-f10dd12b1474bafaf2906b10ed960d1afc92f91c.tar.bz2
samba-f10dd12b1474bafaf2906b10ed960d1afc92f91c.zip
s3-test: try to avoid a problem of CFLAGS propogating to the torture build
CFLAGS is set by s3 to include -D_SAMBA_BUILD_=3. We need to ensure this does not propogate to the smbtorture4 build Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Nov 24 14:40:16 CET 2010 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index faeb3e7513..da531d8930 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3472,8 +3472,8 @@ clean_libnetapi_examples:
cd ../source4 && ./autogen.sh
samba4-configure: ../source4/configure
- @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
- ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+ @CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
+ CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
.PHONY: samba4-configure