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

diff --git a/FLIM-ELS b/FLIM-ELS
index 6eeb3c9..2f8b316 100644
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,26 +5,23 @@
 ;;; 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
+		     unique-id
 		     sasl sasl-cram sasl-digest
-			 scram-md5 unique-id
+		     md4 ntlm sasl-ntlm sasl-scram
 		     smtp qmtp smtpmail))
 
 (setq flim-version-specific-modules '(mailcap))
 
 (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
@@ -36,4 +33,17 @@
 (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