summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2009-08-19 12:38:58 +0200
committerKai Blin <kai@samba.org>2009-08-19 12:39:45 +0200
commitf1434665048a7c16c702da03c32e6174b4bff5bc (patch)
tree2802505835d9bc9efd6fd7d0c48b9846e7da1c4a
parent5270efab1a8dd06158aa45467958939b677e4b7b (diff)
downloadsamba-f1434665048a7c16c702da03c32e6174b4bff5bc.tar.gz
samba-f1434665048a7c16c702da03c32e6174b4bff5bc.tar.bz2
samba-f1434665048a7c16c702da03c32e6174b4bff5bc.zip
s3 merged build: Don't build wbinfo twice.
Many, many thanks to Metze for telling me which chicken to sacrifice.
-rw-r--r--source3/samba4.m43
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 0d7834fc26..e4b2a0a164 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -131,6 +131,9 @@ SMB_INCLUDE_MK(lib/ldb/python.mk)
# Not sure why we need this..
SMB_ENABLE(swig_ldb,YES)
+# Don't build wbinfo twice
+SMB_ENABLE(wbinfo, NO)
+
m4_include(lib/tls/config.m4)
m4_include(torture/libnetapi/config.m4)