Fix.

[elisp/wanderlust.git] / WL-ELS

diff --git a/WL-ELS b/WL-ELS
index ac41fbb..8b238f0 100644 (file)
--- a/WL-ELS
+++ b/WL-ELS
@@ -8,17 +8,17 @@
 ;;; generic modules
 (defconst WL-MODULES '(
    wl wl-folder wl-summary wl-message
-   wl-vars wl-draft wl-util wl-address
+   wl-vars wl-draft wl-util wl-version wl-address
    wl-highlight wl-demo wl-refile wl-thread
    wl-fldmgr wl-expire wl-template wl-score
    ))
 
 (defconst ELMO-MODULES '(
-   elmo-util elmo-imap4 elmo-nntp elmo-archive
+   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
+   elmo-date elmo-internal utf7 pldap
    ))
 
 \f
@@ -31,6 +31,8 @@
   (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)
   (setq WL-MODULES (append WL-MODULES (list 'wl-mule)))))
 
@@ -52,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
@@ -87,7 +75,7 @@
 (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))
+                        sasl-cram sasl-digest))
 
 (defvar modules-alist
   (list