* elmo-imap4.el (toplevel): Require 'ssl.

	Add autoload 'starttls.
	* elmo-pop3.el (toplevel): Ditto.
	* elmo-nntp.el (toplevel): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 83a497d..ecfe1cd 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-21  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-imap4.el (toplevel): Require 'ssl.
+       Add autoload 'starttls.
+       * elmo-pop3.el (toplevel): Ditto.
+       * elmo-nntp.el (toplevel): Ditto.
+
 2000-11-20  Kenichi OKADA  <okada@opaopa.org>
 
        * elmo-imap4.el (toplevel): defun at compile time.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index a3a130a..f60dba8 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -45,30 +45,19 @@
 (require 'elmo-cache)
 (require 'elmo-net)
 (require 'utf7)
+(require 'sasl)
 
 ;;; Code:
-(condition-case nil
-    (progn
-      (require 'sasl))
-  (error))
 ;; silence byte compiler.
 (eval-when-compile
   (require 'cl)
-  (condition-case nil
-      (progn
-       (require 'starttls)
-       (require 'sasl))
-    (error))
-  (defun-maybe starttls-negotiate (a))
   (defun-maybe elmo-generic-list-folder-unread (spec number-alist mark-alist unread-marks))
   (defun-maybe elmo-generic-folder-diff (spec folder number-list))
-  (defsubst-maybe utf7-decode-string (string &optional imap) string)
-  (defun-maybe sasl-find-mechanism (mechanisms))
-  (defun-maybe sasl-make-client (mechanism name service server))
-  (defun-maybe sasl-mechanism-name (client))
-  (defun-maybe sasl-next-step (client step))
-  (defun-maybe sasl-step-data (step))
-  (defun-maybe sasl-step-set-data (step data)))
+  (defsubst-maybe utf7-decode-string (string &optional imap) string))
+
+(eval-and-compile
+  (autoload 'starttls-open-stream "starttls")
+  (autoload 'starttls-negotiate "starttls"))
 
 (defvar elmo-imap4-use-lock t
   "USE IMAP4 with locking process.")

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 554f0aa..20ad2eb 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -35,19 +35,16 @@
 
 (require 'elmo-msgdb)
 (eval-when-compile
-  (condition-case nil
-      (progn
-       (require 'starttls))
-    (error))
   (require 'elmo-cache)
-  (require 'elmo-util)
-  (defun-maybe starttls-negotiate (a)))
+  (require 'elmo-util))
 (require 'elmo-net)
 
 (eval-and-compile
   (luna-define-class elmo-nntp-session (elmo-network-session)
                     (current-group))
-  (luna-define-internal-accessors 'elmo-nntp-session))
+  (luna-define-internal-accessors 'elmo-nntp-session)
+  (autoload 'starttls-open-stream "starttls")
+  (autoload 'starttls-negotiate "starttls"))
 
 ;;
 ;; internal variables

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 18328aa..8df3c76 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -33,25 +33,15 @@
 
 (require 'elmo-msgdb)
 (require 'elmo-net)
+(require 'sasl)
+
 (eval-when-compile
   (require 'elmo-util)
-  (condition-case nil
-      (progn
-       (require 'starttls)
-       (require 'sasl))
-    (error))
-  (defun-maybe md5 (a))
-  (defun-maybe starttls-negotiate (a))
-  (defun-maybe sasl-find-mechanism (mechanisms))
-  (defun-maybe sasl-make-client (mechanism name service server))
-  (defun-maybe sasl-mechanism-name (client))
-  (defun-maybe sasl-next-step (client step))
-  (defun-maybe sasl-step-data (step))
-  (defun-maybe sasl-step-set-data (step data)))
-(condition-case nil
-    (progn
-      (require 'sasl))
-  (error))
+  (defun-maybe md5 (a)))
+
+(eval-and-compile
+  (autoload 'starttls-open-stream "starttls")
+  (autoload 'starttls-negotiate "starttls"))
 
 (defvar elmo-pop3-use-uidl t
   "*If non-nil, use UIDL.")