summaryrefslogtreecommitdiff
path: root/source3/Makefile-smbtorture4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-09 10:59:15 +0200
committerAndrew Bartlett <abartlet@samba.org>2011-05-09 11:21:09 +0200
commit7e8f086798c36f64581ed7444df535e85fa0b5af (patch)
tree511f0050a8c0e072e13c2b6c2de7bd641f34ca6c /source3/Makefile-smbtorture4
parent8aab926c2804230b633e0eb29655f4e32226aa4f (diff)
downloadsamba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.gz
samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.bz2
samba-7e8f086798c36f64581ed7444df535e85fa0b5af.zip
s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes issues when the wrong config.h is used by the recursive smbtorture build Andrew Bartlett
Diffstat (limited to 'source3/Makefile-smbtorture4')
-rw-r--r--source3/Makefile-smbtorture42
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 355c1461c1..0dc4706944 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
samba4-configure:
@(cd .. && \
CFLAGS='' $(WAF) reconfigure || \
- CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --disable-s3build --enable-developer)
+ CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-developer)
.PHONY: samba4-configure