diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 11 | ||||
| -rw-r--r-- | source3/configure.in | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 02b7a294f5..d64adb8baa 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -460,7 +460,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \ lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \ lib/tallocmsg.o lib/dmallocmsg.o \ libsmb/smb_signing.o \ - ../lib/util/charset/iconv.o intl/lang_tdb.o \ + ../lib/util/charset/iconv.o ../lib/util/charset/weird.o \ + ../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \ lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \ lib/sessionid_tdb.o \ lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ @@ -2905,14 +2906,6 @@ bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ) -bin/weird.@SHLIBEXT@: $(BINARY_PREREQS) $(DEVEL_HELP_WEIRD_OBJ) - @echo "Building plugin $@" - @$(SHLD_MODULE) $(DEVEL_HELP_WEIRD_OBJ) - -bin/macosxfs.@SHLIBEXT@: $(BINARY_PREREQS) $(CHARSET_MACOSXFS_OBJ) - @echo "Building plugin $@" - @$(SHLD_MODULE) $(CHARSET_MACOSXFS_OBJ) -framework CoreFoundation - # NOTE, there is no build rule for a dynamic default VFS module because # this one MUST MUST MUST be built statically. 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) |