From f9acf770e9c121aa495cb7e19175a4a6e45ff3d9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 19 Sep 2011 19:13:21 -0700 Subject: lib/util/charset: remove charset module loading Now that the 'table' modules are gone, there is no reason for there to be charset modules at all. This builds the macosxfs and weird modules into the binary at the appropriate times, and changes the tests to test instead the difference between the remaining internal handlers and iconv(). Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Tue Sep 20 06:27:06 CEST 2011 on sn-devel-104 --- source3/configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 32172faec4..068728578e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -474,7 +474,7 @@ default_shared_modules="$default_shared_modules idmap_autorid" if test "x$developer" = xyes; then default_static_modules="$default_static_modules rpc_rpcecho pdb_ads" default_static_modules="$default_static_modules auth_netlogond" - default_shared_modules="$default_shared_modules charset_weird perfcount_test" + default_shared_modules="$default_shared_modules perfcount_test" fi # @@ -683,7 +683,7 @@ main() { AC_DEFINE(BROKEN_UNICODE_COMPOSE_CHARACTERS, 1, [Does this system use unicode compose characters]) # Add a system specific charset module. - default_shared_modules="$default_shared_modules charset_macosxfs" + default_shared_modules="$default_shared_modules" ;; *hurd*) @@ -6877,8 +6877,6 @@ SMB_SUBSYSTEM(IDMAP, winbindd/idmap.o) SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO) SMB_SUBSYSTEM(NSS_INFO, winbindd/nss_info.o) -SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET) -SMB_MODULE(charset_macosxfs, modules/charset_macosxfs.o,"bin/macosxfs.$SHLIBEXT", CHARSET) SMB_SUBSYSTEM(CHARSET,lib/iconv.o) SMB_MODULE(auth_sam, \$(AUTH_SAM_OBJ), "bin/sam.$SHLIBEXT", AUTH) -- cgit