From 6db850901bf4f137fdd315d02914336706bd08f2 Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Tue, 12 Feb 2002 03:18:35 +0000
Subject: [PATCH] Synch up with liece-1_4_6.

---
 INSTALL               |   14 +++++---------
 configure.in          |    2 --
 dcc/Makefile.am       |    6 ++++--
 doc/Makefile.am       |    1 +
 lisp/ChangeLog        |    9 +++++++++
 lisp/Makefile.am      |    2 +-
 lisp/liece-coding.el  |   10 ++++++++--
 lisp/liece-modules.el |    5 +----
 8 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/INSTALL b/INSTALL
index 467ae8b..05f7798 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,19 +7,15 @@
 
   Liece works under following environment at least.
   
-  - Emacs 20.6
-  - XEmacs 21.2 with MULE extension
+  - Emacs 20.7
+  - XEmacs 21.4 or later
   
-  This package uses following external libraries.
+  This package uses following libraries.
   
   - APEL 10.2 or later (stands for - "A Portable Emacs Library")
        ftp://ftp.m17n.org/pub/mule/apel/
   - FLIM 1.12 or later
        ftp://ftp.m17n.org/pub/mule/flim/
-  
-  If you does not have installed copy of above, please try to specify 
-  `--enable-apel' option at configure time.
-  (After configuration, Liece will use local copy of APEL.)
 
 * Quick installation
 
@@ -27,7 +23,7 @@
   % ./configure
   % make
   % su
-  Password: ultrasecret
+  Password:
   # make install
   
   If you are not able to become super-user, you may specify local
@@ -83,7 +79,7 @@
 * Optional packages
 
   Following packages are optional. If install script of this package
-  found them, it would use various functionality provided in them.
+  found them, it would use various functionality provided by them.
   
   custom
 	http://www.dina.kvl.dk/~abraham/custom/
diff --git a/configure.in b/configure.in
index b16dd8c..ed3cfdd 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,6 @@ AC_INIT(configure.in)
 AC_PREREQ(2.13)
 AM_INIT_AUTOMAKE(liece, 2.0.0)
 
-AM_PATH_LISPDIR
-
 AC_PROG_CC
 AC_ISC_POSIX
 AC_PROG_INSTALL
diff --git a/dcc/Makefile.am b/dcc/Makefile.am
index 270d34c..fb8fab0 100644
--- a/dcc/Makefile.am
+++ b/dcc/Makefile.am
@@ -1,12 +1,14 @@
 DEFS = -I$(srcdir) -I$(top_srcdir) $(CFLAGS) @DEFS@
-LIBS = @LIBOBJS@
-EXTRA_DIST = getopt.c getopt.h getopt1.c
+LIBOBJS = @LIBOBJS@
+EXTRA_DIST = basename.c getopt.c getopt.h getopt1.c
 CLEANFILES = ldcc ltcp
 
 bin_PROGRAMS = ldcc ltcp
 
 ltcp_SOURCES = tcp.c
+ltcp_LDADD = $(LIBOBJS)
 ldcc_SOURCES = dcc.c
+ldcc_LDADD = $(LIBOBJS)
 
 package: all
 install-package: package install
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c061e04..6e62a28 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,3 +17,4 @@ all: liece.info
 	$(TEXI_XML) $*.txml
 	-recode -df utf8..texi < $@ > tmp
 	mv tmp $@
+
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e76c3a0..01b7abe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-12  Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-modules.el (liece-modules-to-compile): Add `liece-coding'.
+
+	* liece-coding.el (liece-mime-charset-for-write): Use
+	default-mime-charset-for-write as its default.
+	(liece-mime-charset-for-read): Use default-mime-charset as its
+	default.
+
 2002-01-28  Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-dcc.el (liece-dcc-start-process): New function.
diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index d6d9ce2..b4e9471 100644
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = $(wildcard *.el) Makefile.lisp
+EXTRA_DIST = $(wildcard *.el) Makefile.lisp liece.xpm liece.xbm
 DISTCLEANFILES = liece-setup.el
 
 all: elc
diff --git a/lisp/liece-coding.el b/lisp/liece-coding.el
index deee745..2670cf6 100644
--- a/lisp/liece-coding.el
+++ b/lisp/liece-coding.el
@@ -40,12 +40,18 @@
   :prefix "liece-"
   :group 'liece)
   
-(defcustom liece-mime-charset-for-write 'iso-2022-jp-2
+(defcustom liece-mime-charset-for-write
+  (if (mime-charset-p 'iso-2022-jp-2)
+      'iso-2022-jp-2
+    default-mime-charset-for-write)
   "Charset used in any transferred messages."
   :type 'mime-charset
   :group 'liece-coding)
 
-(defcustom liece-mime-charset-for-read 'x-ctext
+(defcustom liece-mime-charset-for-read
+  (if (mime-charset-p 'x-ctext)
+      'x-ctext
+    default-mime-charset)
   "Charset used in any transferred messages."
   :type 'mime-charset
   :group 'liece-coding)
diff --git a/lisp/liece-modules.el b/lisp/liece-modules.el
index 14c5b5e..a41cd08 100644
--- a/lisp/liece-modules.el
+++ b/lisp/liece-modules.el
@@ -38,6 +38,7 @@
     liece-globals
     liece-inlines
     liece-filter
+    liece-coding
     liece-dcc
     liece-menu
     liece-000
@@ -70,11 +71,7 @@
 (if (fboundp 'set-face-stipple)
     (push 'bitmap-stipple liece-modules-to-compile))
 
-(if (featurep 'mule)
-    (push 'liece-coding liece-modules-to-compile))
-
 (require 'pccl)
-
 (unless-broken ccl-usable
   (push 'liece-q-ccl liece-modules-to-compile))
 
-- 
1.7.10.4