s3 merged build: Don't build wbinfo twice.

Many, many thanks to Metze for telling me which chicken to sacrifice.

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 0d7834fc260a06105daf7bd9b0002acae89e6cbd..e4b2a0a164588daebc7de0e3713e99cec6921ea8 100644 (file)
--- 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)