Update.

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index 3d0693e..44d5b8d 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -14,7 +14,6 @@
 (defvar DOCDIR "./doc")
 (defvar ICONDIR "./etc/icons")
 (defvar UTILSDIR "./utils")
-(defvar SASLDIR "./utils/sasl/lisp")
 (defvar WL_PREFIX "wl")
 (defvar ELMO_PREFIX "wl")
 
@@ -22,8 +21,6 @@
 
 (defvar wl-install-utils nil
   "if Non-nil, install `wl-utils-modules'.")
-(defvar wl-install-sasl nil
-  "if Non-nil, install sasl utilities.")
 
 ;;; INFO
 (defconst wl-ja-info "wl-ja.info")
@@ -35,7 +32,7 @@
   "The language of info file (\"ja\" or \"en\").")
 
 ;; for Nemacs (dirty!)
-(or (fboundp 'file-executable-p)
+(if (not (fboundp 'file-executable-p))
     (fset 'file-executable-p 'file-exists-p))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -89,24 +86,26 @@
 
 (defun config-wl-package-subr ()
   (unless config-wl-package-done
-  (setq config-wl-package-done t)
-  (setq load-path (cons (expand-file-name ".") load-path))
-  (setq load-path (cons (expand-file-name WLDIR)
-                       (cons (expand-file-name ELMODIR) load-path)))
-  (setq wl-icon-dir (expand-file-name ICONDIR))
-;;; load custom file if exists.
-  (load "./WL-CFG" t nil t)
-;;; load-path
-  (if wl-install-utils
-      (setq load-path (cons (expand-file-name UTILSDIR) load-path)))
-  (if wl-install-sasl
-      (setq load-path (cons (expand-file-name SASLDIR) load-path)))
-  (require 'install)
-  (load "./WL-ELS")
-  (condition-case ()
-      (require 'mime-setup)
-    (error (error "No MIME module was detected. Please install SEMI or tm.")))
-  (princ (concat "\nMIME module is " (if wl-use-semi "SEMI" "tm-8") ".\n"))))
+    (setq config-wl-package-done t)
+    (setq load-path (cons (expand-file-name ".") load-path))
+    (setq load-path (cons (expand-file-name WLDIR)
+                         (cons (expand-file-name ELMODIR) load-path)))
+    (setq wl-icon-dir (expand-file-name ICONDIR))
+    ;; load custom file if exists.  `WL-CFG.el' override for committer.
+    (load "./WL-CFG" t nil nil)
+    ;; load-path
+    (if wl-install-utils
+       (setq load-path (cons (expand-file-name UTILSDIR) load-path)))
+    (require 'install)
+    (load "./WL-ELS" nil nil t)
+    (condition-case ()
+       (require 'mime-setup)
+      (error (error "No MIME module was detected. Please install SEMI or tm.")))
+    ;; smtp.el version check.
+    (require 'smtp)
+    (if (not (fboundp 'smtp-send-buffer))
+       (error "Please install FLIM 1.14.0 or later."))
+    (princ (concat "\nMIME module is " (if wl-use-semi "SEMI" "tm-8") ".\n"))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."
@@ -206,7 +205,7 @@
                                          LISPDIR))
        (elmo-install-dir (expand-file-name ELMO_PREFIX
                                            LISPDIR)))
-    (wl-uninstall (wl-scan-source (list WLDIR UTILSDIR SASLDIR))
+    (wl-uninstall (wl-scan-source (list WLDIR UTILSDIR))
                  wl-install-dir)
     (wl-uninstall (wl-scan-source (list ELMODIR))
                  elmo-install-dir))
@@ -350,6 +349,8 @@
       (error "Cannot format info on Nemacs. Please use another formatter."))
   ;; INFODIR check.
   (require 'info)
+  (if (fboundp 'info-initialize)
+      (info-initialize))
   (let ((infodir (car command-line-args-left))
        (info (wl-primary-info-file))
        previous INFODIR)