X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FLIM-ELS;h=6a9c5bd1ce18cb7aaaba67ffca3e91e0acc16c25;hb=bb8ef91e24323a85c97cd39546daf8d079cbae57;hp=0fa8ca9281010b50aed58fccf94f30b1b85d04df;hpb=cfbeb2aa70dd2506c32ce4a2e1d232731a93701d;p=elisp%2Fflim.git

diff --git a/FLIM-ELS b/FLIM-ELS
index 0fa8ca9..6a9c5bd 100644
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,32 +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
-		     mailcap
+		     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 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