X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLIM-ELS;h=6a9c5bd1ce18cb7aaaba67ffca3e91e0acc16c25;hb=87dac904ce3a0d0afa5c7b14fea6c92b180679be;hp=5c232f2f77b6464aa1fdabf1c813ffdbbe63da9e;hpb=4248a1b9eb6e8271990355e6393683be2a0ec54b;p=elisp%2Fflim.git

diff --git a/FLIM-ELS b/FLIM-ELS
index 5c232f2..6a9c5bd 100644
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,21 +5,44 @@
 ;;; Code:
 
 (setq flim-modules '(std11
-		     mime-def
-		     mel mel-b mel-q mel-u mel-g
+		     luna lunit mime-def
+		     mel mel-q mel-u mel-g
 		     eword-decode eword-encode
-		     mime mime-parse mmbuffer mmcooked
-		     mailcap))
+		     mime mime-parse mmgeneric
+		     mmbuffer mmcooked mmexternal
+		     mime-conf
+		     sasl sasl-cram sasl-digest
+		     md4 ntlm sasl-ntlm sasl-scram
+		     smtp qmtp))
+
+(setq flim-version-specific-modules nil)
+
+(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))
+
+(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 flim-modules (cons 'mel-b-dl flim-modules))
-  )
-
-(if (and (featurep 'mule)
-	 (not (or (and (boundp 'MULE) MULE)
-		  (and (featurep 'xemacs) (< emacs-major-version 21))
-		  )))
-    (setq flim-modules (cons 'mel-ccl flim-modules))
-  )
+    (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