* Sync up to flim-1_12_5 from flim-1_12_1.

[elisp/flim.git] / FLIM-ELS

diff --git a/FLIM-ELS b/FLIM-ELS
index 3b4949c..7debfc9 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -6,7 +6,7 @@
 
 (setq flim-modules '(std11
                      mime-def
-                    mel mel-ccl mel-b mel-q mel-u mel-g
+                    mel mel-q mel-u mel-g
                      closure
                      natset
                      digraph
@@ -26,12 +26,21 @@
                      ew-scan-n
                      ew-dec
                     eword-decode eword-encode
-                    mime mime-parse mmbuffer mmcooked
+                     ew-compat
+                    mime mime-parse mmgeneric mmbuffer mmcooked
                     mailcap
-                     ))
+                    smtp smtpmail))
 
-(if (fboundp 'dynamic-link)
-    (setq flim-modules (cons 'mel-dl flim-modules))
+(unless (and (fboundp 'base64-encode-string)
+            (subrp (symbol-function 'base64-encode-string)))
+  (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))))
+
 ;;; FLIM-ELS ends here