diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-16 14:52:28 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-20 04:53:05 +0200 |
| commit | 8316577b7538f7204c5fd6328756c4c3f171b36e (patch) | |
| tree | 12afa55329f2b725c8a4ba26bf9e222683d8a9bb /source3 | |
| parent | be4f188128d631abe014a8182c22a03f4c09264a (diff) | |
| download | samba-8316577b7538f7204c5fd6328756c4c3f171b36e.tar.gz samba-8316577b7538f7204c5fd6328756c4c3f171b36e.tar.bz2 samba-8316577b7538f7204c5fd6328756c4c3f171b36e.zip | |
lib/util/charcnv: Remove broken internal CP850 and CP464 modules
These modules are now known to be faulty, and Samba 3.6.0 didn't
include support for them, so we now require a system iconv if you wish
to support these character sets for the non-ASCII range.
Andrew Bartlett
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 10 | ||||
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/wscript | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 1b796377c0..02b7a294f5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -797,8 +797,6 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \ passdb/pdb_util.o DEVEL_HELP_WEIRD_OBJ = ../lib/util/charset/weird.o -CP850_OBJ = ../lib/util/charset/CP850.o -CP437_OBJ = ../lib/util/charset/CP437.o CHARSET_MACOSXFS_OBJ = ../lib/util/charset/charset_macosxfs.o GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o @@ -2911,14 +2909,6 @@ bin/weird.@SHLIBEXT@: $(BINARY_PREREQS) $(DEVEL_HELP_WEIRD_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(DEVEL_HELP_WEIRD_OBJ) -bin/CP850.@SHLIBEXT@: $(BINARY_PREREQS) $(CP850_OBJ) - @echo "Building plugin $@" - @$(SHLD_MODULE) $(CP850_OBJ) - -bin/CP437.@SHLIBEXT@: $(BINARY_PREREQS) $(CP437_OBJ) - @echo "Building plugin $@" - @$(SHLD_MODULE) $(CP437_OBJ) - bin/macosxfs.@SHLIBEXT@: $(BINARY_PREREQS) $(CHARSET_MACOSXFS_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(CHARSET_MACOSXFS_OBJ) -framework CoreFoundation diff --git a/source3/configure.in b/source3/configure.in index 59c2ef93d7..32172faec4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -455,8 +455,6 @@ default_shared_modules="$default_shared_modules vfs_cap" default_shared_modules="$default_shared_modules vfs_expand_msdfs" default_shared_modules="$default_shared_modules vfs_shadow_copy" default_shared_modules="$default_shared_modules vfs_shadow_copy2" -default_shared_modules="$default_shared_modules charset_CP850" -default_shared_modules="$default_shared_modules charset_CP437" default_shared_modules="$default_shared_modules auth_script" default_shared_modules="$default_shared_modules vfs_readahead" default_shared_modules="$default_shared_modules vfs_xattr_tdb" @@ -6880,8 +6878,6 @@ SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIB SMB_SUBSYSTEM(NSS_INFO, winbindd/nss_info.o) SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET) -SMB_MODULE(charset_CP850, modules/CP850.o, "bin/CP850.$SHLIBEXT", CHARSET) -SMB_MODULE(charset_CP437, modules/CP437.o, "bin/CP437.$SHLIBEXT", CHARSET) SMB_MODULE(charset_macosxfs, modules/charset_macosxfs.o,"bin/macosxfs.$SHLIBEXT", CHARSET) SMB_SUBSYSTEM(CHARSET,lib/iconv.o) diff --git a/source3/wscript b/source3/wscript index 1f4e7c37cf..86949d258c 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1735,9 +1735,6 @@ main() { default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond charset_weird')) default_shared_modules.extend(TO_LIST('perfcount_test')) - if Options.options.developer or not conf.CONFIG_SET('HAVE_NATIVE_ICONV'): - default_static_modules.extend(TO_LIST('charset_CP850 charset_CP437')) - if conf.env.toplevel_build: default_static_modules.extend(TO_LIST('pdb_samba4 auth_samba4')) |