X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=WL-ELS;h=8d31d2ef91cae72fec331931cdbdf98b81b6edcc;hb=97aa25b89a81ff0102907c1435d4b76ea9d03126;hp=dc5eb065c53bf3863f124e63eca5bb427fffec72;hpb=806725e3db0748ddc973ba045053a6681e840287;p=elisp%2Fwanderlust.git

diff --git a/WL-ELS b/WL-ELS
index dc5eb06..8d31d2e 100644
--- a/WL-ELS
+++ b/WL-ELS
@@ -14,11 +14,14 @@
    ))
 
 (defconst ELMO-MODULES '(
-   elmo-util elmo-version elmo-net elmo-imap4 elmo-nntp elmo-archive
-   elmo-localdir elmo-msgdb elmo-vars elmo2
-   elmo-cache elmo-multi elmo-filter elmo-pipe
-   elmo-dop elmo-pop3 elmo-localnews elmo-maildir
-   elmo-date elmo-internal utf7 pldap
+   utf7 pldap mmimap
+   elmo-date elmo-util elmo-version elmo-vars elmo elmo-msgdb
+   elmo-net elmo-imap4 elmo-pop3 elmo-nntp
+   elmo-localdir elmo-localnews elmo-map elmo-maildir
+   elmo-multi elmo-filter
+   elmo-archive elmo-pipe elmo-cache
+   elmo-internal elmo-mark
+   elmo-dop elmo-nmz
    ))
 
 
@@ -45,6 +48,9 @@
         (fboundp 'open-database))
     (add-to-list 'ELMO-MODULES 'elmo-database))
 
+(if (module-installed-p 'shimbun)
+    (add-to-list 'ELMO-MODULES 'elmo-shimbun))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; tm-8 / SEMI
 
@@ -52,31 +58,17 @@
     (progn
       (defconst wl-use-semi t)
       (setq WL-MODULES (append WL-MODULES (list 'wl-mime)))
-      (setq ELMO-MODULES (append ELMO-MODULES (list 'mmelmo 'mmelmo-imap4))))
+      (setq ELMO-MODULES (append ELMO-MODULES (list 'elmo-mime))))
   (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
@@ -86,11 +78,6 @@
 (if (module-installed-p 'base64)
     (add-to-list 'UTILS-MODULES 'ssl))
 
-(defconst SASL-MODULES '(hmac-def hmac-md5 hmac-sha1
-			 hex-util md5-dl md5-el md5
-			 sha1-dl sha1-el sha1 sasl
-			 scram-md5 digest-md5 unique-id))
-
 (defvar modules-alist
   (list
    (cons ELMODIR ELMO-MODULES)
@@ -100,9 +87,4 @@
    (if (exec-installed-p "imput")
        (cons UTILSDIR (list 'im-wl)))
    (if wl-install-utils
-       (cons UTILSDIR UTILS-MODULES))
-   ;; sasl does not work under Nemacs.
-   (if (and wl-install-sasl
-	    (not (fboundp 'nemacs-version)))
-       (cons SASLDIR SASL-MODULES))
-    ))
+       (cons UTILSDIR UTILS-MODULES))))