Synch with wl-2_8.

diff --git a/ChangeLog b/ChangeLog
index 7733474..b3d3ea6 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/INSTALL.ja
+++ b/INSTALL.ja
@@ -85,6 +85,12 @@ MIME\e$BMQ%b%8%e!<%k$N%$%s%9%H!<%k\e(B
   APEL, FLIM, SEMI \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r%$%s%9\e(B
   \e$B%H!<%k$7D>$7$F$/$@$5$$!#\e(B
 
+  \e$B0J2<$r<B9T$9$k$3$H$K$h$j!"\e(BAPEL, FLIM, SEMI \e$B$N%A%'%C%/$r4^$s$@4D6-%F%9\e(B
+  \e$B%H$,9T$($^$9!#\e(BEMACS \e$B$G\e(B emacs \e$B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#\e(B
+
+       % make check
+       % make EMACS=xemacs check
+
 
 \e$BDL>o$N%$%s%9%H!<%k\e(B
 ==================

diff --git a/NEWS b/NEWS
index 1f804e3..8067161 100644 (file)
--- 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 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -7,6 +7,8 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 ** FLIM 1.14.2 \e$B0JA0$N\e(B FLIM \e$B$G$O$&$^$/F0$+$J$$>l9g$,$"$j$^$9!#\e(B
    FLIM 1.14.3 \e$B0J9_$*$h$SBP1~$7$?\e(B SEMI \e$B$r%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 
+** make check \e$B$G4JC1$J4D6-%F%9%H$,$G$-$k$h$&$K$J$j$^$7$?!#\e(B
+
 ** \e$BL>A0JQ99Ey$G4{$K;H$o$l$J$/$J$C$?JQ?t$,@_Dj$5$l$F$$$k$H\e(B warning
    \e$B$,I=<($5$l$k$h$&$K$J$j$^$7$?!#\e(B
    warning \e$B$NI=<($rM^@)$9$k$K$O!"JQ?t\e(B elmo-obsolete-variable-show-warnings \e$B$r\e(B

diff --git a/WL-MK b/WL-MK
index 0026e0a..c4f181c 100644 (file)
--- 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."