update.

[elisp/flim.git] / FLIM-ELS

diff --git a/FLIM-ELS b/FLIM-ELS
index abc3ce7..6a9c5bd 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,34 +5,44 @@
 ;;; Code:
 
 (setq flim-modules '(std11
-                    luna mime-def
+                    luna lunit mime-def
                     mel mel-q mel-u mel-g
                     eword-decode eword-encode
                     mime mime-parse mmgeneric
-                    mmbuffer mmcooked mmdbuffer mmexternal
+                    mmbuffer mmcooked mmexternal
                     mime-conf
                     sasl sasl-cram sasl-digest
-                    smtp qmtp smtpmail))
+                    md4 ntlm sasl-ntlm sasl-scram
+                    smtp qmtp))
 
-(setq flim-version-specific-modules '(mailcap))
+(setq flim-version-specific-modules nil)
 
 (setq hmac-modules '(hex-util
-                    hmac-def
-                    md5 md5-el md5-dl
-                    sha1 sha1-el sha1-dl
+                    hmac-def md5 sha1
                     hmac-md5 hmac-sha1))
 
-(setq flim-modules (nconc hmac-modules flim-modules))
-
 (if (and (fboundp 'base64-encode-string)
         (subrp (symbol-function 'base64-encode-string)))
     nil
   (if (fboundp 'dynamic-link)
-      (setq flim-modules (cons 'mel-b-dl flim-modules)))
-  (setq flim-modules (cons 'mel-b-el flim-modules)))
+      (setq flim-modules (cons 'mel-b-dl flim-modules))))
+(setq flim-modules (cons 'mel-b-el flim-modules))
 
 (require 'pccl)
 (unless-broken ccl-usable
   (setq flim-modules (cons 'mel-b-ccl (cons 'mel-q-ccl flim-modules))))
 
+(if (and (fboundp 'md5)
+        (subrp (symbol-function 'md5)))
+    nil
+  (if (fboundp 'dynamic-link)
+      (setq hmac-modules (cons 'md5-dl hmac-modules))
+    (setq hmac-modules (cons 'md5-el hmac-modules))))
+
+(if (fboundp 'dynamic-link)
+    (setq hmac-modules (cons 'sha1-dl hmac-modules))
+  (setq hmac-modules (cons 'sha1-el hmac-modules)))
+
+(setq flim-modules (nconc hmac-modules flim-modules))
+
 ;;; FLIM-ELS ends here