From 2007cb635ba51586b1f8d33c1d8a83f0a14bfa45 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 10 Nov 2000 10:51:01 +0000
Subject: [PATCH] * Mule23@1934.en, Mule23@1934.ja, sample.lpath.el: Upgrade.

* configure: Regenerate.
* aclocal.m4 (AC_PATH_PACKAGEDIR): No need to quote a string for
 `AC_MSG_RESULT'.
(AC_CHECK_W3): Ignore cache; no need to quote a string for `AC_MSG_RESULT'.
(AC_CHECK_EMACS_FLAVOR): Ignore cache.
(AC_CHECK_EMACS): Ignore cache.
(AC_DEFINE_GNUS_PRODUCT_NAME): Cache.
---
 ChangeLog       |   13 ++++++
 Mule23@1934.en  |  135 ++++++++++++++++++++++++++++++++++++++++-------------
 Mule23@1934.ja  |  138 ++++++++++++++++++++++++++++++++++++++++++-------------
 aclocal.m4      |   25 ++++++++--
 configure       |   68 +++++++++++++++++----------
 sample.lpath.el |   52 +++++++++++++--------
 6 files changed, 319 insertions(+), 112 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f53964..0620300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-11-10  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* Mule23@1934.en, Mule23@1934.ja, sample.lpath.el: Upgrade.
+
+	* configure: Regenerate.
+	* aclocal.m4 (AC_PATH_PACKAGEDIR): No need to quote a string for
+	`AC_MSG_RESULT'.
+	(AC_CHECK_W3): Ignore cache; no need to quote a string for
+	`AC_MSG_RESULT'.
+	(AC_CHECK_EMACS_FLAVOR): Ignore cache.
+	(AC_CHECK_EMACS): Ignore cache.
+	(AC_DEFINE_GNUS_PRODUCT_NAME): Cache.
+
 2000-11-09  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* configure: Regenerate.
diff --git a/Mule23@1934.en b/Mule23@1934.en
index 3f764d3..7a45479 100644
--- a/Mule23@1934.en
+++ b/Mule23@1934.en
@@ -1,30 +1,38 @@
 How to build T-gnus with Mule 2.3 based on Emacs 19.34.
 
-FIX loaddefs.el
-===============
+FIXING loaddefs.el
+==================
 
 Unfortunately, some variables for `message' are predefined in lisp/
 loaddefs.el which is dumped in Mule executable file.  It is uninvited,
 moreover, it has a bad influence.  So you should remove these
 definitions from lisp/loaddefs.el and rebuild Mule.  However, if you
-don't want to rebuild Mule, put the following lines in the beginning
-of .emacs file instead.
-
-(mapcar
- (lambda (symbol)
-   (makunbound (intern (format "message-%s" symbol))))
- '(citation-line-function
-   cite-function courtesy-message default-headers default-mail-headers
-   default-news-headers deletable-headers fcc-handler-function
-   followup-to-function from-style generate-headers-first generate-new-buffers
-   ignored-bounced-headers ignored-cited-headers ignored-mail-headers
-   ignored-news-headers ignored-resent-headers ignored-supersedes-headers
-   included-forward-headers indent-citation-function interactive
-   kill-buffer-on-exit post-method reply-to-function required-mail-headers
-   required-news-headers send-mail-function send-news-function
-   signature signature-before-forwarded-message signature-file
-   signature-separator syntax-checks use-followup-to user-organization-file
-   wide-reply-to-function yank-prefix))
+don't want to rebuild Mule, you may put the following lines in the
+beginning of .emacs file instead of rebuilding Mule.
+
+(let ((symbols '(citation-line-function
+		 cite-function courtesy-message default-headers
+		 default-mail-headers default-news-headers
+		 deletable-headers fcc-handler-function
+		 followup-to-function from-style
+		 generate-headers-first generate-new-buffers
+		 ignored-bounced-headers ignored-cited-headers
+		 ignored-mail-headers ignored-news-headers
+		 ignored-resent-headers ignored-supersedes-headers
+		 included-forward-headers indent-citation-function
+		 interactive kill-buffer-on-exit post-method
+		 reply-to-function required-mail-headers
+		 required-news-headers send-mail-function
+		 send-news-function signature
+		 signature-before-forwarded-message signature-file
+		 signature-separator syntax-checks use-followup-to
+		 user-organization-file wide-reply-to-function
+		 yank-prefix))
+      symbol)
+  (while symbols
+    (setq symbol (car symbols)
+	  symbols (cdr symbol))
+    (makunbound (intern (format "message-%s" symbol)))))
 
 
 INSTALL CUSTOM, APEL, FLIM, SEMI/WEMI
@@ -57,20 +65,83 @@ ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/custom-1.9962.tar.gz
 INSTALL T-gnus
 ==============
 
-There are two ways of making T-gnus with Mule 2.3 based on Emacs 19.34.
+There are three ways of making T-gnus with Mule 2.3 based on Emacs 19.34.
 
- 1. Use the configure option `--with-addpath=' to specify the colon
-    separated directory names where EMU, APEL or CUSTOM packages have
-    already installed.  For example:
+1. If you have installed EMU, APEL, FLIM and SEMI or WEMI packages
+   under the standard load-path, for instance:
 
-    % configure --with-emacs=mule\
-      --with-addpath=~/elisp/emu:~/elisp/apel:~elisp/custom
-    % make install
+   EMU:  /usr/local/share/mule/19.34/site-lisp/
+   APEL: /usr/local/share/mule/site-lisp/apel/
+   FLIM: /usr/local/share/mule/site-lisp/flim/
+   SEMI: /usr/local/share/mule/site-lisp/semi/
 
- 2. Copy `sample.lpath.el' to `~/.lpath.el' and modify it suitably for
-    your environment.  Then type as following:
+   What is more, if you have been replaced old CUSTOM with new CUSTOM
+   or if you have installed new CUSTOM directly under the standard
+   load-path as such as /usr/local/share/mule/19.34/site-lisp/, you
+   may have nothing to be done; type the following commands right now.
 
-    % configure
-    % make EMACS=mule
+   % ./configure --with-emacs=mule
+   % make install
 
-    In this case, you shuold install manually.
+   However, if you have installed new CUSTOM in the subdirectory under
+   the standard load-path, use the configure option `--with-addpath='
+   as follows:
+
+   % ./configure --with-emacs=mule\
+     --with-addpath=/usr/local/share/mule/site-lisp/custom/
+   % make install
+
+   or you can use the file subdirs.el under the parent directory of
+   the subdirectory of CUSTOM to add it into load-path which contain
+   the following contents:
+
+   (normal-top-level-add-to-load-path
+    '("custom/" "and the other subdirectories.../"))
+
+   and then just type:
+
+   % ./configure --with-emacs=mule
+   % make install
+
+2. If you have installed EMU, APEL, FLIM and SEMI or WEMI packages in
+   the non-standard load-path, use the configure option
+   `--with-addpath=' with the colon separated directory names where
+   EMU, APEL or CUSTOM packages are installed.  For example:
+
+   % ./configure --with-emacs=mule\
+     --with-addpath=~/elisp/emu/:~/elisp/apel/:~/elisp/custom/
+   % make install
+
+   In this case, you have no need to add paths of FLIM, SEMI or WEMI
+   if they are installed under the directory which is same as the
+   parent directory of APEL.
+
+3. This is another way to install T-gnus when you have installed EMU,
+   APEL, FLIM and SEMI or WEMI packages in the non-standard load-path.
+   Copy the file `sample.lpath.el' which is included in the
+   distribution to `~/.lpath.el' and modify it suitably for your
+   environment.  And then type the following command.
+
+   % ./configure --with-emacs=mule
+   % make install
+
+
+USING Emacs W3
+==============
+
+;; By the way, it is the point, does anyone know where do we find
+;; Emacs W3 package fitting with Mule 2.3 based on Emacs 19.34? :-p
+
+Some modules of T-gnus (e.g. nnshimbun) requires Emacs W3.  You can
+build T-gnus to be abel to use them, if you already have Emacs W3
+installed.  For that, you should specify the path where Emacs W3 is
+installed using the configure option `--with-w3=' or editing the file
+`~/.lpath.el'.  Here is an example for using the configure option:
+
+   % ./configure --with-emacs=mule\
+     --with-w3=/usr/local/share/mule/site-lisp/w3/
+   % make install
+
+Don't mind if configure says "W3... not found".  It is currently
+malfunction when the configure option `--with-w3=' is not used even if
+the path of Emacs W3 is specified in the file `~/.lpath.el'.
diff --git a/Mule23@1934.ja b/Mule23@1934.ja
index d759e64..5f79393 100644
--- a/Mule23@1934.ja
+++ b/Mule23@1934.ja
@@ -1,30 +1,39 @@
 Emacs 19.34 をベースにした Mule 2.3 で T-gnus を作る方法。
 
-FIX loaddefs.el
-===============
+FIXING loaddefs.el
+==================
 
 残念なことにいくつかの `message' で使う変数が lisp/loaddefs.el で定義
 されていて Mule の実行ファイルに組み込まれてしまっています。これは余計
 なお世話だし、しかも悪影響があります。そこであなたはそれらの定義を
 lisp/loaddefs.el から削除して、Mule を作り直さなければなりません。
 しかし、もしあなたが Mule を作り直すことを望まないならば、.emacs ファ
-イルの先頭に以下の各行を書き込むことで代用することができます。
-
-(mapcar
- (lambda (symbol)
-   (makunbound (intern (format "message-%s" symbol))))
- '(citation-line-function
-   cite-function courtesy-message default-headers default-mail-headers
-   default-news-headers deletable-headers fcc-handler-function
-   followup-to-function from-style generate-headers-first generate-new-buffers
-   ignored-bounced-headers ignored-cited-headers ignored-mail-headers
-   ignored-news-headers ignored-resent-headers ignored-supersedes-headers
-   included-forward-headers indent-citation-function interactive
-   kill-buffer-on-exit post-method reply-to-function required-mail-headers
-   required-news-headers send-mail-function send-news-function
-   signature signature-before-forwarded-message signature-file
-   signature-separator syntax-checks use-followup-to user-organization-file
-   wide-reply-to-function yank-prefix))
+イルの先頭に以下の各行を書き込むことで、Mule を作り直す代わりにするこ
+とができます。
+
+(let ((symbols '(citation-line-function
+		 cite-function courtesy-message default-headers
+		 default-mail-headers default-news-headers
+		 deletable-headers fcc-handler-function
+		 followup-to-function from-style
+		 generate-headers-first generate-new-buffers
+		 ignored-bounced-headers ignored-cited-headers
+		 ignored-mail-headers ignored-news-headers
+		 ignored-resent-headers ignored-supersedes-headers
+		 included-forward-headers indent-citation-function
+		 interactive kill-buffer-on-exit post-method
+		 reply-to-function required-mail-headers
+		 required-news-headers send-mail-function
+		 send-news-function signature
+		 signature-before-forwarded-message signature-file
+		 signature-separator syntax-checks use-followup-to
+		 user-organization-file wide-reply-to-function
+		 yank-prefix))
+      symbol)
+  (while symbols
+    (setq symbol (car symbols)
+	  symbols (cdr symbol))
+    (makunbound (intern (format "message-%s" symbol)))))
 
 
 INSTALL CUSTOM, APEL, FLIM, SEMI
@@ -57,20 +66,87 @@ ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/custom-1.9962.tar.gz
 INSTALL T-gnus
 ==============
 
-Mule 2.3 based on Emacs 19.34 で gnus を作るには二つの方法があります。
+Emacs 19.34 をベースにした Mule 2.3 で gnus を作るには三つの方法があり
+ます。
 
- 1. configure オプションの `--with-addpath=' を使って EMU, APEL および
-    CUSTOM の各パッケージがインストールされている場所を指定して下さい。
-    例えば
+1. もしあなたが EMU, APEL, FLIM および SEMI または WEMI の各パッケー
+   ジを標準の load-path の下にインストールしているとします。例えばこう。
 
-    % configure --with-emacs=mule\
-      --with-addpath=~/elisp/emu:~/elisp/apel:~elisp/custom
-    % make
+   EMU:  /usr/local/share/mule/19.34/site-lisp/
+   APEL: /usr/local/share/mule/site-lisp/apel/
+   FLIM: /usr/local/share/mule/site-lisp/flim/
+   SEMI: /usr/local/share/mule/site-lisp/semi/
 
- 2. `sample.lpath.el' を `~/.lpath.el' にコピーして、あなたの環境に
-    合うように書き換えて下さい。そして次のようにタイプして下さい。
+   しかも、もしあなたが古い CUSTOM を新しい CUSTOM で置き換えているか、
+   新しい CUSTOM を /usr/local/share/mule/19.34/site-lisp/ のような標
+   準の load-path の直下にインストールしているならば、あなたは何もす
+   る必要がありません。今すぐに以下のコマンドをタイプして下さい。
 
-    % configure
-    % make EMACS=mule
+   % ./configure --with-emacs=mule
+   % make install
 
-    この場合 install は手作業で行なって下さい。
+   しかし、もしあなたが新しい CUSTOM を標準の load-path の下のサブディ
+   レクトリにインストールしてあるならば、以下のように configure オプ
+   ションの `--with-addpath=' を使うか、
+
+   % ./configure --with-emacs=mule\
+     --with-addpath=/usr/local/share/mule/site-lisp/custom/
+   % make install
+
+   あるいはあなたは以下の内容を含む、CUSTOM サブディレクトリの親ディ
+   レクトリの下の subdirs.el ファイルを使うことができます。
+
+   (normal-top-level-add-to-load-path
+    '("custom/" "and the other subdirectories.../"))
+
+   そして単に
+
+   % ./configure --with-emacs=mule
+   % make install
+
+   とタイプして下さい。
+
+2. もしあなたが EMU, APEL, FLIM および SEMI または WEMI の各パッケー
+   ジを標準ではない load-path にインストールしているならば、コロンで
+   区切られた EMU, APEL および CUSTOM がインストールされているディレ
+   クトリ名と configure オプションの `--with-addpath=' を使って下さい。
+   例えば
+
+   % ./configure --with-emacs=mule\
+     --with-addpath=~/elisp/emu/:~/elisp/apel/:~/elisp/custom/
+   % make
+
+   この場合、もし FLIM, SEMI または WEMI が APEL の親ディレクトリと同
+   じディレクトリの下にインストールされているならば、それらの path を
+   追加する必要はありません。
+
+3. これは、EMU, APEL, FLIM および SEMI または WEMI の各パッケージを標
+   準ではない load-path にインストールしている場合の、別の方法です。
+   配布に含まれているファイル `sample.lpath.el' を `~/.lpath.el' にコ
+   ピーして、あなたの環境に合うように書き換えて下さい。そして次のコマ
+   ンドをタイプして下さい。
+
+   % ./configure --with-emacs=mule
+   % make install
+
+USING Emacs W3
+==============
+
+;; ところで、肝心なことなんですが、誰か Emacs 19.34 をベースにした
+;; Mule 2.3 に適合する Emacs W3 がどこにあるか知りませんか? :-p
+
+いくつかの T-gnus のモジュール (例えば nnshimbun) は Emacs W3 を必要と
+します。もしあなたがすでに Emacs W3 をインストールしてあるのならば、あ
+なたはそれらを使えるように T-gnus を作ることができます。そのためには、
+configure オプションの `--with-w3=' を使うか `~/.lpath.el' ファイルを
+編集して、Emacs W3 がインストールされている path を指定しなければなり
+ません。以下は configure オプションを使う例です。
+
+   % ./configure --with-emacs=mule\
+     --with-w3=/usr/local/share/mule/site-lisp/w3/
+   % make install
+
+もし configure が「W3... not found」と言っても気にしないで下さい。たと
+え `~/.lpath.el' ファイルで Emacs W3 の path が指定されていても、
+configure オプションの `--with-w3=' を使わないと、現在それは正常に働き
+ませんので。
diff --git a/aclocal.m4 b/aclocal.m4
index c03607b..aee05d3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,8 @@
 AC_DEFUN(AC_DEFINE_GNUS_PRODUCT_NAME,
- [dnl Defining gnus product name.
-  GNUS_PRODUCT_NAME=$1
+ [echo $ac_n "defining gnus product name... $ac_c"
+  AC_CACHE_VAL(EMACS_cv_GNUS_PRODUCT_NAME,[EMACS_cv_GNUS_PRODUCT_NAME=$1])
+  GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME}
+  AC_MSG_RESULT(${GNUS_PRODUCT_NAME})
   AC_SUBST(GNUS_PRODUCT_NAME)])
 
 AC_DEFUN(AC_CHECK_EMACS,
@@ -10,6 +12,9 @@ AC_DEFUN(AC_CHECK_EMACS,
   dnl environment variable to 't'.  Lets undo the damage.
   test x$EMACS = xt && EMACS=
 
+  dnl Ignore cache.
+  unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
+
   AC_ARG_WITH(emacs,
    [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]],
    [if test x$withval = xyes -o x$withval = x; then
@@ -53,6 +58,10 @@ fi
 
 AC_DEFUN(AC_CHECK_EMACS_FLAVOR,
  [AC_MSG_CHECKING([what a flavor does $EMACS have])
+
+  dnl Ignore cache.
+  unset EMACS_cv_SYS_flavor;
+
   AC_EMACS_LISP(flavor,
     (cond ((featurep (quote xemacs)) \"XEmacs\")\
           ((boundp (quote MULE)) \"MULE\")\
@@ -133,6 +142,12 @@ dnl Perform sanity checking and try to locate the W3 package
 dnl
 AC_DEFUN(AC_CHECK_W3, [
 AC_MSG_CHECKING(for acceptable W3 version)
+
+dnl Ignore cache.
+unset EMACS_cv_ACCEPTABLE_W3;
+unset EMACS_cv_SYS_w3_dir;
+unset EMACS_cv_SYS_w3_forms;
+
 AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_W3,[
 AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho")
 if test "${HAVE_w3_forms}" = "yes"; then
@@ -150,9 +165,9 @@ fi
    W3=${EMACS_cv_ACCEPTABLE_W3}
    AC_SUBST(W3)
    if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
-	AC_MSG_RESULT("not found")
+	AC_MSG_RESULT(not found)
    else
-	AC_MSG_RESULT("${W3}")
+	AC_MSG_RESULT(${W3})
    fi
 ])
 
@@ -187,7 +202,7 @@ AC_DEFUN(AC_PATH_PACKAGEDIR,
       fi],
       AC_EXAMINE_PACKAGEDIR)
     if test x$PACKAGEDIR = x; then
-      AC_MSG_RESULT("not found")
+      AC_MSG_RESULT(not found)
     else
       AC_MSG_RESULT($PACKAGEDIR)
     fi
diff --git a/configure b/configure
index d407bfb..6cc8412 100755
--- a/configure
+++ b/configure
@@ -535,10 +535,18 @@ else
 fi
 
 
-  GNUS_PRODUCT_NAME=t-gnus
+echo $ac_n "defining gnus product name... $ac_c"
+  if eval "test \"\${EMACS_cv_GNUS_PRODUCT_NAME+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  EMACS_cv_GNUS_PRODUCT_NAME=t-gnus
+fi
+
+  GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME}
+  echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
   
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:542: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:550: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -595,7 +603,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:599: checking for a BSD compatible install" >&5
+echo "configure:607: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"\${ac_cv_path_install+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -654,7 +662,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:658: checking for $ac_word" >&5
+echo "configure:666: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -684,6 +692,8 @@ fi
 
       test x$EMACS = xt && EMACS=
 
+    unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
+
   # Check whether --with-emacs or --without-emacs was given.
 if test "${with_emacs+set}" = set; then
   withval="$with_emacs"
@@ -693,7 +703,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:697: checking for $ac_word" >&5
+echo "configure:707: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -727,7 +737,7 @@ test -n "$EMACS" || EMACS="emacs"
       # Extract the first word of "$withval", so it can be a program name with args.
 set dummy $withval; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:731: checking for $ac_word" >&5
+echo "configure:741: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -764,7 +774,7 @@ if test "${with_xemacs+set}" = set; then
       # Extract the first word of "xemacs", so it can be a program name with args.
 set dummy xemacs; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:768: checking for $ac_word" >&5
+echo "configure:778: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -795,7 +805,7 @@ fi
       # Extract the first word of "$withval", so it can be a program name with args.
 set dummy $withval; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:799: checking for $ac_word" >&5
+echo "configure:809: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -832,7 +842,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:836: checking for $ac_word" >&5
+echo "configure:846: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -868,14 +878,17 @@ fi
   
 
   echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6
-echo "configure:872: checking what a flavor does $EMACS have" >&5
+echo "configure:882: checking what a flavor does $EMACS have" >&5
+
+    unset EMACS_cv_SYS_flavor;
+
   
 elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\
           ((boundp (quote MULE)) \"MULE\")\
           (t \"FSF Emacs\"))"
 if test -z ""noecho""; then
 	echo $ac_n "checking for flavor""... $ac_c" 1>&6
-echo "configure:879: checking for flavor" >&5
+echo "configure:892: checking for flavor" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -907,12 +920,12 @@ fi
   echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6
   if test "$prefix" = "NONE"; then
 	echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
-echo "configure:911: checking prefix for your Emacs" >&5
+echo "configure:924: checking prefix for your Emacs" >&5
 	
 elisp="(expand-file-name \"..\" invocation-directory)"
 if test -z ""noecho""; then
 	echo $ac_n "checking for prefix""... $ac_c" 1>&6
-echo "configure:916: checking for prefix" >&5
+echo "configure:929: checking for prefix" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -943,7 +956,7 @@ if test "${with_lispdir+set}" = set; then
 fi
 
   echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
-echo "configure:947: checking where lisp files should go" >&5
+echo "configure:960: checking where lisp files should go" >&5
   if test -z "$lispdir"; then
         theprefix=$prefix
     if test "x$theprefix" = "xNONE"; then
@@ -968,7 +981,12 @@ echo "configure:947: checking where lisp files should go" >&5
 
 
 echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:972: checking for acceptable W3 version" >&5
+echo "configure:985: checking for acceptable W3 version" >&5
+
+unset EMACS_cv_ACCEPTABLE_W3;
+unset EMACS_cv_SYS_w3_dir;
+unset EMACS_cv_SYS_w3_forms;
+
 if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -976,14 +994,14 @@ else
 
 if test -z ""noecho""; then
 	echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:980: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:998: checking for w3-form-encode-xwfu in w3_forms" >&5
 fi
 library=`echo w3_forms | tr _ -`
 
 elisp="(progn (fmakunbound (quote w3-form-encode-xwfu)) (condition-case nil (progn (require (quote $library)) (fboundp (quote w3-form-encode-xwfu))) (error (prog1 nil (message \"$library not found\")))))"
 if test -z ""noecho""; then
 	echo $ac_n "checking for w3_forms""... $ac_c" 1>&6
-echo "configure:987: checking for w3_forms" >&5
+echo "configure:1005: checking for w3_forms" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1027,7 +1045,7 @@ if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then
 elisp="(file-name-directory (locate-library \"w3-forms\"))"
 if test -z ""noecho""; then
 	echo $ac_n "checking for w3_dir""... $ac_c" 1>&6
-echo "configure:1031: checking for w3_dir" >&5
+echo "configure:1049: checking for w3_dir" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1062,14 +1080,14 @@ fi
    W3=${EMACS_cv_ACCEPTABLE_W3}
    
    if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
-	echo "$ac_t"""not found"" 1>&6
+	echo "$ac_t""not found" 1>&6
    else
-	echo "$ac_t"""${W3}"" 1>&6
+	echo "$ac_t""${W3}" 1>&6
    fi
 
   if test ${EMACS_FLAVOR} = xemacs; then
     echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
-echo "configure:1073: checking where the XEmacs package is" >&5
+echo "configure:1091: checking where the XEmacs package is" >&5
     # Check whether --with-packagedir or --without-packagedir was given.
 if test "${with_packagedir+set}" = set; then
   withval="$with_packagedir"
@@ -1092,7 +1110,7 @@ elisp="(let (package-dir)\
       (or package-dir \"\"))"
 if test -z ""noecho""; then
 	echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1096: checking for PACKAGEDIR" >&5
+echo "configure:1114: checking for PACKAGEDIR" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1131,7 +1149,7 @@ elisp="(let (package-dir)\
       (or package-dir \"\"))"
 if test -z ""noecho""; then
 	echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1135: checking for PACKAGEDIR" >&5
+echo "configure:1153: checking for PACKAGEDIR" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1155,7 +1173,7 @@ fi
 fi
 
     if test x$PACKAGEDIR = x; then
-      echo "$ac_t"""not found"" 1>&6
+      echo "$ac_t""not found" 1>&6
     else
       echo "$ac_t""$PACKAGEDIR" 1>&6
     fi
@@ -1168,7 +1186,7 @@ if test "${with_addpath+set}" = set; then
   withval="$with_addpath"
   if test x$withval != xyes -a x$withval != x; then
       echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
-echo "configure:1172: checking where to find the additional elisp libraries" >&5
+echo "configure:1190: checking where to find the additional elisp libraries" >&5
       ADDITIONAL_LOAD_PATH=$withval
       echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
     fi
diff --git a/sample.lpath.el b/sample.lpath.el
index 4a17420..f0d4d3c 100644
--- a/sample.lpath.el
+++ b/sample.lpath.el
@@ -4,25 +4,39 @@
 ;; is supposed to be used for telling old Emacsen where EMU, APEL or
 ;; CUSTOM packages have already installed.
 ;;
-;; For instance, if you would like to make gnus with Mule 2.3 based on
-;; Emacs 19.34, copy this file to `~/.lpath.el' and modify it suitably
+;; For instance, if you would like to build T-gnus with Mule 2.3 based
+;; on Emacs 19.34, copy this file to `~/.lpath.el' and edit it suitably
 ;; for your environment.
 
-(when (boundp 'MULE)
-  (let ((EMU
-	 ;; Where is EMU packege?
-	 "/usr/local/share/mule/19.34/site-lisp"
-	 )
-	(APEL
-	 ;; Where is APEL package?
-	 "/usr/local/share/mule/site-lisp/apel"
-	 )
-	(CUSTOM
-	 ;; Where is CUSTOM package?
-	 "/usr/local/share/mule/site-lisp/custom"
-	 ))
-    ;; No user servicable parts beyond this point.
+(if (boundp 'MULE)
+    (let ((additional-load-path
+	   (list
+	    ;; Where is EMU packege?
+	    "/usr/local/share/mule/19.34/site-lisp/"
+	    ;; Where is APEL package?
+	    "/usr/local/share/mule/site-lisp/apel/"
+	    ;; Where is CUSTOM package?
+	    "/usr/local/share/mule/site-lisp/custom/"
+
+	    ;; Note that you have no need to specify paths of FLIM, SEMI
+	    ;; or WEMI if they are installed under the directory which is
+	    ;; same as the parent directory of APEL.
+
+	    ;; If you have installed Emacs W3 package,
+	    ;; uncomment and edit the following line appropriately.
+	    ;; "/usr/local/share/mule/site-lisp/w3/"
+	    )))
+      ;; No user servicable parts beyond this point.
 
-    (when (string-match "/apel/?$" APEL)
-      (setq APEL (substring APEL 0 (match-beginning 0))))
-    (setq load-path (nconc (list EMU APEL CUSTOM) load-path))))
+      (let ((i (length additional-load-path))
+	    p)
+	(while (> i 0)
+	  (setq i (1- i)
+		p (nth i additional-load-path))
+	  (if (file-directory-p p)
+	      (progn
+		(if (string-match "/apel/?$" p)
+		    (setq load-path
+			  (cons (substring p 0 (1+ (match-beginning 0)))
+				load-path)))
+		(setq load-path (cons p load-path))))))))
-- 
1.7.10.4