summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-24 19:18:24 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-24 19:18:24 +0000
commit9ba1ed52719df0a5eef723ecbfec11f6035a9710 (patch)
treeff3e78dde481c59d805d84c0244c44aca08e80f0
parent068b1e91419bf95373597ef6cf94e76d1ff5af58 (diff)
downloadsamba-9ba1ed52719df0a5eef723ecbfec11f6035a9710.tar.gz
samba-9ba1ed52719df0a5eef723ecbfec11f6035a9710.tar.bz2
samba-9ba1ed52719df0a5eef723ecbfec11f6035a9710.zip
When using --with-static-modules=subsystem, don't build modules that
can't be build (This used to be commit bb943a68af20f87a4b2d6b257585615d1792dd33)
-rw-r--r--source3/aclocal.m42
-rw-r--r--source3/configure.in8
2 files changed, 6 insertions, 4 deletions
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)