From 921503fa92f7aa246fbb4aafad7c3033ea19ea09 Mon Sep 17 00:00:00 2001
From: kaoru <kaoru>
Date: Sun, 16 Dec 2001 06:53:52 +0000
Subject: [PATCH] Synch with wl-2_8.

---
 ChangeLog  |    5 +++++
 INSTALL    |    8 +++++++-
 INSTALL.ja |    6 ++++++
 NEWS       |    2 ++
 NEWS.ja    |    2 ++
 WL-MK      |   12 ++++++++----
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7733474..b3d3ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-16  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* WL-MK (config-wl-package-subr): Added APEL version check.
+	Changed check order; APEL, FLIM, SEMI.
+
 2001-12-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* INSTALL, INSTALL.ja: Added System Requirements.
diff --git a/INSTALL b/INSTALL
index b14829e..ac2fc6a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,7 +29,8 @@ System Requirements
 Select MIME Module
 ==================
 
-  For each Emacsen, Recommended combination of MIME module package following.
+  For each Emacsen, Recommended combination of MIME module package
+  follows.
 
   (a) XEmacs 21.1 or later
 
@@ -81,6 +82,11 @@ Install MIME Module
 
   You have to re-install Wanderlust if you upgraded APEL, FLIM, or SEMI.
 
+  Do following, running environment test included APEL, FLIM, and SEMI
+  version check.  You can specify the emacs command name.
+
+	% make check
+	% make EMACS=xemacs check
 
 Installation
 ============
diff --git a/INSTALL.ja b/INSTALL.ja
index 0296675..50d8cdc 100644
--- a/INSTALL.ja
+++ b/INSTALL.ja
@@ -85,6 +85,12 @@ MIME用モジュールのインストール
   APEL, FLIM, SEMI のバージョンアップを行った場合は、Wanderlust をインス
   トールし直してください。
 
+  以下を実行することにより、APEL, FLIM, SEMI のチェックを含んだ環境テス
+  トが行えます。EMACS で emacs のコマンド名を指定することができます。
+
+	% make check
+	% make EMACS=xemacs check
+
 
 通常のインストール
 ==================
diff --git a/NEWS b/NEWS
index 1f804e3..8067161 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 ** Wanderlust might not work with FLIM 1.14.2 and older.
    It is recommended to use FLIM 1.14.3 or newer and associated SEMI.
 
+** Now available `make check' environment test for user.
+
 ** If you set obsolete variables (e.g. renamed ones), Wanderlust shows warning
    messages and urge you to change settings.
    To suppress warning messages, set elmo-obsolete-variable-show-warnings to
diff --git a/NEWS.ja b/NEWS.ja
index cf98a06..01255a3 100644
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -7,6 +7,8 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust.
 ** FLIM 1.14.2 以前の FLIM ではうまく動かない場合があります。
    FLIM 1.14.3 以降および対応した SEMI をインストールしてください。
 
+** make check で簡単な環境テストができるようになりました。
+
 ** 名前変更等で既に使われなくなった変数が設定されていると warning
    が表示されるようになりました。
    warning の表示を抑制するには、変数 elmo-obsolete-variable-show-warnings を
diff --git a/WL-MK b/WL-MK
index 0026e0a..c4f181c 100644
--- a/WL-MK
+++ b/WL-MK
@@ -103,13 +103,17 @@
 	(setq load-path (cons (expand-file-name UTILSDIR) load-path)))
     (require 'install)
     (load "./WL-ELS" nil nil t)
-    (condition-case ()
-	(require 'mime-setup)
-      (error (error "No MIME module was detected.  Please install SEMI")))
+    ;; product.el version check
+    (require 'product)
+    (if (not (fboundp 'product-version-as-string))
+	(error "Please install new APEL.  See INSTALL or INSTALL.ja"))
     ;; smtp.el version check.
     (require 'smtp)
     (if (not (fboundp 'smtp-send-buffer))
-	(error "Please install new FLIM.  See INSTALL or INSTALL.ja"))))
+	(error "Please install new FLIM.  See INSTALL or INSTALL.ja"))
+    (condition-case ()
+	(require 'mime-setup)
+      (error (error "Cannot load `mime-setup'.  Please install SEMI")))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."
-- 
1.7.10.4