From: teranisi <teranisi>
Date: Fri, 20 Oct 2000 01:17:59 +0000 (+0000)
Subject: * WL-MK (config-wl-package-subr): Changed message.
X-Git-Tag: wl-2_4-root~107
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=387b01150aa330c6bf4db3bf4c50cf5a12267fa6;p=elisp%2Fwanderlust.git

* WL-MK (config-wl-package-subr): Changed message.

* WL-ELS: Abolished FLIM 1.12 support.
Notify tm-8 requires APEL 10.2 or later.
---

diff --git a/ChangeLog b/ChangeLog
index 50a404c..26b2afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* WL-MK (config-wl-package-subr): Changed message.
+
+	* WL-ELS: Abolished FLIM 1.12 support.
+	Notify tm-8 requires APEL 10.2 or later.
+
 2000-10-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* etc/icons/wl-logo.xbm: Removed.
diff --git a/WL-ELS b/WL-ELS
index dc5eb06..0fb9c57 100644
--- a/WL-ELS
+++ b/WL-ELS
@@ -54,29 +54,15 @@
       (setq WL-MODULES (append WL-MODULES (list 'wl-mime)))
       (setq ELMO-MODULES (append ELMO-MODULES (list 'mmelmo 'mmelmo-imap4))))
   (defconst wl-use-semi nil)
-  (setq WL-MODULES (append WL-MODULES (list 'tm-wl)))
-  )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; FLIM 1.12 / FLIM 1.13
-(cond
- ((module-installed-p 'luna)
-  ;; FLIM 1.13 (SEMI/tm-8)
-  (defconst wl-use-luna t)
-  (setq ELMO-MODULES
-	(append ELMO-MODULES
-		(list 'mmelmo-2
-		      'mmelmo-imap4-2))))
- (wl-use-semi
-  ;; FLIM 1.12
-  (defconst wl-use-luna nil)
-  (setq ELMO-MODULES
-	(append ELMO-MODULES
-		(list 'mmelmo-1
-		      'mmelmo-imap4-1))))
- )
-
+  (setq WL-MODULES (append WL-MODULES (list 'tm-wl))))
+
+(if (not (module-installed-p 'luna))
+    (if wl-use-semi
+	(error "Use FLIM-1.13.2 or later and SEMI 1.13.7 or later.")
+      (if (module-installed-p 'product)
+	  (error "Use tm-8.x with APEL 10.2 or later.")
+	;; tm but luna is not installed (tm7?)
+	(error "Use tm-8.x."))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Utils
diff --git a/WL-MK b/WL-MK
index ddeb17e..48d14bd 100644
--- a/WL-MK
+++ b/WL-MK
@@ -105,10 +105,7 @@
   (condition-case ()
       (require 'mime-setup)
     (error (error "No MIME module was detected. Please install SEMI or tm.")))
-  (if wl-use-semi
-      (princ (concat "\nUse SEMI"
-		     (if wl-use-luna " with LUNA\n" " without LUNA\n")))
-    (princ "\nUse tm.\n"))))
+  (princ (concat "\nMIME module is " (if wl-use-semi "SEMI" "tm-8") ".\n"))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."