X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLIM-ELS;h=2f8b316ac5ac1f74a8c9ad6224dff0b02a19fc3b;hb=2a5762fd26492904a4cbb577612026f404cbd9c4;hp=d03d26a2c07ce5d7b20b5ad73c748d58918931f1;hpb=ac974cc7c09c80ada6678a04c6f919723035a37d;p=elisp%2Fflim.git

diff --git a/FLIM-ELS b/FLIM-ELS
index d03d26a..2f8b316 100644
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,28 +5,45 @@
 ;;; 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 mmbuffer mmcooked mmdbuffer
-		     mailcap
-		     smtp smtpmail sasl
-		     md5 md5-el md5-dl
-		     sha1 sha1-el sha1-dl
-		     hmac-def hmac-md5 hmac-sha1 hex-util
-		     scram-md5 digest-md5 unique-id
-		     starttls))
-
-(unless (and (fboundp 'base64-encode-string)
-	     (subrp (symbol-function 'base64-encode-string)))
+		     mime mime-parse mmgeneric
+		     mmbuffer mmcooked mmexternal
+		     mime-conf
+		     unique-id
+		     sasl sasl-cram sasl-digest
+		     md4 ntlm sasl-ntlm sasl-scram
+		     smtp qmtp smtpmail))
+
+(setq flim-version-specific-modules '(mailcap))
+
+(setq hmac-modules '(hex-util
+		     hmac-def md5 sha1
+		     hmac-md5 hmac-sha1))
+
+(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