X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=WL-ELS;h=f54144c3951384d21a26d3d932bc7259e678b4c1;hb=33d9128fae4ddb2529278fbf8a0bebc0ee64d2c4;hp=956bc51d0db92d0334ff8b702fb87d92924e49da;hpb=7c2c219bc5e37edf2d94c3f9deb205cb6fe982bd;p=elisp%2Fwanderlust.git

diff --git a/WL-ELS b/WL-ELS
index 956bc51..f54144c 100644
--- a/WL-ELS
+++ b/WL-ELS
@@ -7,18 +7,25 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; generic modules
 (defconst WL-MODULES '(
-   wl wl-folder wl-summary wl-message
-   wl-vars wl-draft wl-util wl-version wl-address
+   wl wl-folder wl-summary wl-action wl-message
+   wl-vars wl-draft wl-util wl-version wl-address wl-addrmgr
    wl-highlight wl-demo wl-refile wl-thread
-   wl-fldmgr wl-expire wl-template wl-score
+   wl-fldmgr wl-expire wl-template wl-score wl-acap wl-news
+   wl-spam wl-batch
    ))
 
 (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 acap slp mmimap
+   elmo-signal 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-access elmo-filter
+   elmo-archive elmo-pipe elmo-cache
+   elmo-internal elmo-flag elmo-sendlog elmo-null
+   elmo-dop elmo-search elmo-file elmo-split
+   elmo-spam elsp-bogofilter elsp-sa elsp-bsfilter elsp-spamoracle
+   modb modb-entity modb-legacy modb-standard
    ))
 
 
@@ -29,8 +36,6 @@
  ((featurep 'xemacs)
   (setq WL-MODULES (append WL-MODULES (list 'wl-dnd 'wl-xmas)))
   (setq ELMO-MODULES (append (list 'elmo-database) ELMO-MODULES)))
- ((fboundp 'nemacs-version)
-  (setq WL-MODULES (append WL-MODULES (list 'wl-nemacs))))
  ((and (boundp 'emacs-major-version) (>= emacs-major-version 21))
   (setq WL-MODULES (append WL-MODULES (list 'wl-e21))))
  ((featurep 'mule)
@@ -41,32 +46,27 @@
    ))
 
 (if (or (fboundp 'dynamic-link)
-        ;; static
-        (fboundp 'open-database))
+	;; static
+	(fboundp 'open-database))
     (add-to-list 'ELMO-MODULES 'elmo-database))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; tm-8 / SEMI
+(if (module-installed-p 'shimbun)
+    (add-to-list 'ELMO-MODULES 'elmo-shimbun))
+
+(if (module-installed-p 'spamfilter)
+    (add-to-list 'ELMO-MODULES 'elsp-spamfilter))
 
-(if (module-installed-p 'mime-view)
-    (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))))
-  (defconst wl-use-semi nil)
-  (setq WL-MODULES (append WL-MODULES (list 'tm-wl))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; SEMI
 
+(setq WL-MODULES (append WL-MODULES (list 'wl-mime)))
+(setq ELMO-MODULES (append ELMO-MODULES (list 'elmo-mime)))
 (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."))))
+    (error "Use new FLIM & SEMI.  See INSTALL or INSTALL.ja"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Utils
-(defvar UTILS-MODULES '(rfc2368 wl-mailto))
+(defvar UTILS-MODULES '(rfc2368 im-wl wl-mailto wl-addrbook wl-complete))
 
 ;; OpenSSL/SSLeay package is also needed.
 (if (module-installed-p 'base64)
@@ -78,7 +78,5 @@
    (cons WLDIR WL-MODULES)
    (if (module-installed-p 'bbdb)
        (cons UTILSDIR (list 'bbdb-wl)))
-   (if (exec-installed-p "imput")
-       (cons UTILSDIR (list 'im-wl)))
    (if wl-install-utils
-       (cons UTILSDIR UTILS-MODULES))))
\ No newline at end of file
+       (cons UTILSDIR UTILS-MODULES))))