diff options
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/source3/configure.in b/source3/configure.in index 20c3b2ef04..98e01f5bd5 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -239,7 +239,11 @@ AC_VALIDATE_CACHE_SYSTEM_TYPE DYNEXP= dnl Add modules that have to be built by default here -default_modules="pdb_smbpasswd pdb_tdbsam pdb_unix rpc_lsa rpc_samr rpc_reg rpc_wks rpc_net rpc_dfs rpc_srv rpc_spoolss auth_rhosts auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_recycle vfs_audit vfs_extd_audit vfs_fake_perms vfs_netatalk" +dnl These have to be built static: +default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_unix rpc_lsa rpc_samr rpc_reg rpc_wks rpc_net rpc_dfs rpc_srv rpc_spoolss auth_rhosts auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin" + +dnl These are preferably build shared, and static if dlopen() is not available +default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_fake_perms vfs_netatalk" # # Config CPPFLAG settings for strange OS's that must be set @@ -2255,7 +2259,7 @@ if test x"$with_ldap_support" = x"yes"; then if test x$have_ldap != xyes; then AC_CHECK_LIB(ldap, ldap_domain2hostlist, [LIBS="$LIBS -lldap"; AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])]) - AC_CHECK_HEADERS([ldap.h lber.h], [default_modules="$default_modules pdb_ldap"]) + AC_CHECK_HEADERS([ldap.h lber.h], [default_static_modules="$default_static_modules pdb_ldap"]) ######################################################## # If we have LDAP, does it's rebind procedure take 2 or 3 arguments? @@ -2272,11 +2276,11 @@ fi ######################################################## # Compile with MySQL support? -AM_PATH_MYSQL([0.11.0],[default_modules="$default_modules pdb_mysql"],[]) +AM_PATH_MYSQL([0.11.0],[default_shared_modules="$default_shared_modules pdb_mysql"],[]) ######################################################## # Compile with XML support? -AM_PATH_XML2([2.0.0],[default_modules="$default_modules pdb_xml"],[]) +AM_PATH_XML2([2.0.0],[default_shared_modules="$default_shared_modules pdb_xml"],[]) ################################################# # check for automount support @@ -3333,13 +3337,22 @@ AC_ARG_WITH(python, esac ]) AC_SUBST(PYTHON) -for i in `echo $default_modules | sed -e's/,/ /g'` +for i in `echo $default_static_modules | sed -e's/,/ /g'` do - dnl Set to shared instead of static when dlopen() is available? eval MODULE_DEFAULT_$i=STATIC done -# Always built these modules static +for i in `echo $default_shared_modules | sed -e's/,/ /g'` +do + dnl Fall back to static if dlopen() is not available + eval MODULE_DEFAULT_$i=STATIC + + if test x"$ac_cv_func_dlopen" = xyes; then + eval MODULE_DEFAULT_$i=SHARED + fi +done + +dnl Always built these modules static MODULE_pdb_guest=STATIC MODULE_rpc_spoolss=STATIC MODULE_rpc_srv=STATIC |