diff --git a/source/lib/ldb/config.m4 b/source/lib/ldb/config.m4
index 5701b1b5c3b..1a65eebd018 100644
--- a/source/lib/ldb/config.m4
+++ b/source/lib/ldb/config.m4
@@ -1,7 +1,9 @@
+SMB_MODULE_DEFAULT(libldb_ldap,NOT)
 if test x"$with_ldap_support" = x"yes"; then
     SMB_MODULE_DEFAULT(libldb_ldap,STATIC)
 fi
 
+SMB_LIBRARY_ENABLE(libldb,NO)
 if test x"$experimental" = x"yes"; then
 	SMB_LIBRARY_ENABLE(libldb,YES)
 fi
diff --git a/source/lib/socket/config.m4 b/source/lib/socket/config.m4
index 1140c139cbc..b301c6060cd 100644
--- a/source/lib/socket/config.m4
+++ b/source/lib/socket/config.m4
@@ -2,6 +2,7 @@
 dnl test for ipv6 using the gethostbyname2() function. That should be sufficient
 dnl for now
 AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false)
+SMB_MODULE_DEFAULT(socket_ipv6, NOT)
 if $have_ipv6 = true; then
     SMB_MODULE_DEFAULT(socket_ipv6, STATIC)
     AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support])
diff --git a/source/smbd/process_model.m4 b/source/smbd/process_model.m4
index d53b4de3a39..94ef6f13d2b 100644
--- a/source/smbd/process_model.m4
+++ b/source/smbd/process_model.m4
@@ -1,5 +1,7 @@
 dnl # Server process model subsystem
 
+SMB_MODULE_DEFAULT(process_model_thread,NOT)
+
 #################################################
 # check for pthread support
 AC_MSG_CHECKING(whether to use pthreads)