diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-15 11:13:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:51 -0500 |
| commit | 5b397619ccd3a2189c053209387093b60ff53094 (patch) | |
| tree | b132d2bc86f434ce8b05ca2163d915f9b6fbb652 | |
| parent | 39a6a2c6005dcea9818b36448bd4d8e3e2e23511 (diff) | |
| download | samba-5b397619ccd3a2189c053209387093b60ff53094.tar.gz samba-5b397619ccd3a2189c053209387093b60ff53094.tar.bz2 samba-5b397619ccd3a2189c053209387093b60ff53094.zip | |
r3753: Have some modules default to "NOT" and enable them again when
their dependencies are found
(This used to be commit 8e7e98ae5fca8be8c6a0b4c543b6828c46172171)
| -rw-r--r-- | source4/lib/ldb/config.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/socket/config.m4 | 1 | ||||
| -rw-r--r-- | source4/smbd/process_model.m4 | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4 index 5701b1b5c3..1a65eebd01 100644 --- a/source4/lib/ldb/config.m4 +++ b/source4/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/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index 1140c139cb..b301c6060c 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/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/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 index d53b4de3a3..94ef6f13d2 100644 --- a/source4/smbd/process_model.m4 +++ b/source4/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) |