* WL-MK (config-wl-package-subr): Added APEL version check.

Changed check order; APEL, FLIM, SEMI.

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/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."