From 9ba1ed52719df0a5eef723ecbfec11f6035a9710 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Mar 2003 19:18:24 +0000
Subject: When using --with-static-modules=subsystem, don't build modules that
 can't be build (This used to be commit
 bb943a68af20f87a4b2d6b257585615d1792dd33)

---
 source3/aclocal.m4   | 2 +-
 source3/configure.in | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 4814a86a96..79fbc8628e 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -43,7 +43,7 @@ AC_DEFUN(SMB_MODULE,
 	AC_MSG_CHECKING([how to build $1])
 	if test "$[MODULE_][$1]"; then
 		DEST=$[MODULE_][$1]
-	elif test "$[MODULE_]translit([$4], [A-Z], [a-z])"; then
+	elif test "$[MODULE_]translit([$4], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
 		DEST=$[MODULE_]translit([$4], [A-Z], [a-z])
 	else
 		DEST=$[MODULE_DEFAULT_][$1]
diff --git a/source3/configure.in b/source3/configure.in
index cbd1eec710..15ff11eaa8 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3343,6 +3343,11 @@ do
 	eval MODULE_DEFAULT_$i=STATIC
 done
 
+# Always built these modules static
+MODULE_pdb_guest=STATIC
+MODULE_rpc_spools=STATIC
+MODULE_rpc_srv=STATIC
+
 AC_ARG_WITH(static-modules,
 [  --with-static-modules=MODULES  Comma-seperated list of names of modules to statically link in],
 [ if test $withval; then
@@ -3361,9 +3366,6 @@ AC_ARG_WITH(shared-modules,
 	done
 fi ])
 
-# Always built these modules static
-MODULE_pdb_guest=STATIC
-
 SMB_MODULE(pdb_xml, modules/xml.o, bin/xml.so, PDB)
 SMB_MODULE(pdb_mysql, modules/mysql.o, bin/mysql.so, PDB)
 SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o, bin/ldapsam.so, PDB)
-- 
cgit