diff options
| author | Alexander Bokovoy <ab@samba.org> | 2003-08-26 19:48:16 +0000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2003-08-26 19:48:16 +0000 |
| commit | 7e27147422e78125c2bb5b8115bd9084a657e084 (patch) | |
| tree | 5653755bc833ca1376ce0539dd78a448c45c5505 /source3/Makefile.in | |
| parent | 5e6c6d766f5782dd1f91bf249f5f8ea7878977a6 (diff) | |
| download | samba-7e27147422e78125c2bb5b8115bd9084a657e084.tar.gz samba-7e27147422e78125c2bb5b8115bd9084a657e084.tar.bz2 samba-7e27147422e78125c2bb5b8115bd9084a657e084.zip | |
Fix for #150.
We now fallback to Samba-provided CP850 charset module if CP850 or IBM850 does not exist on target system at runtime.
1. Introduce CP850 charset module based on charmaps table from GNU libc 2.2.5
2. Make CP850 charset module shared and build it by default
Should fix Solaris run-time
(This used to be commit e855dc8c9115fa11d315eb34d57722ff612daa11)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 49c27a4537..6286d7d087 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -186,6 +186,8 @@ LIB_SMBD_OBJ = lib/system_smbd.o lib/util_smbd.o READLINE_OBJ = lib/readline.o +# Also depends on $(SECRETS_OBJ) $(LIBSAMBA_OBJ) +# Be sure to include them into your application POPT_LIB_OBJ = lib/popt_common.o UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \ @@ -284,7 +286,8 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \ XML_OBJ = passdb/pdb_xml.o MYSQL_OBJ = passdb/pdb_mysql.o -DEVEL_HELP_OBJ = modules/weird.o +DEVEL_HELP_WEIRD_OBJ = modules/weird.o +DEVEL_HELP_CP850_OBJ = modules/CP850.o GROUPDB_OBJ = groupdb/mapping.o @@ -521,7 +524,7 @@ NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) -SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_OBJ) $(UBIQX_OBJ) $(POPT_LIB_OBJ) +SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_OBJ) $(UBIQX_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) LOG2PCAP_OBJ = utils/log2pcaphex.o @@ -1058,9 +1061,14 @@ bin/smbpasswd.@SHLIBEXT@: passdb/pdb_smbpasswd.po @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_smbpasswd.po \ @SONAMEFLAG@`basename $@` -bin/weird.@SHLIBEXT@: $(DEVEL_HELP_OBJ:.o=.po) +bin/weird.@SHLIBEXT@: $(DEVEL_HELP_WEIRD_OBJ:.o=.po) @echo "Building plugin $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_OBJ:.o=.po) \ + @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ:.o=.po) \ + @SONAMEFLAG@`basename $@` + +bin/CP850.@SHLIBEXT@: $(DEVEL_HELP_CP850_OBJ:.o=.po) + @echo "Building plugin $@" + @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_CP850_OBJ:.o=.po) \ @SONAMEFLAG@`basename $@` bin/xml.@SHLIBEXT@: $(XML_OBJ:.o=.po) |