* elmo-net.el: Add autoload settings for `starttls-negotiate',

`sasl-find-mechanism', `sasl-make-client', `sasl-mechanism-name',
`sasl-next-step', `sasl-step-data' and `sasl-step-set-data'; bind
`sasl-mechanisms'.

* elmo-imap4.el: Don't require `sasl'; remove autoload settings
for `starttls-open-stream' and `starttls-negotiate'.

* elmo-nntp.el: Remove autoload settings for
`starttls-open-stream' and `starttls-negotiate'.

* elmo-pop3.el: Don't require `sasl'; remove autoload settings
for `starttls-open-stream' and `starttls-negotiate'; don't enclose
`luna-define-class' with `eval-and-compile'.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 537e951..96a9a12 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -45,19 +45,10 @@
 (require 'elmo-cache)
 (require 'elmo-net)
 (require 'utf7)
-(require 'sasl)
 
 ;;; Code:
 ;; silence byte compiler.
-(eval-when-compile
-  (require 'cl)
-  (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))
-
-(eval-and-compile
-  (autoload 'starttls-open-stream "starttls")
-  (autoload 'starttls-negotiate "starttls"))
+(eval-when-compile (require 'cl))
 
 (defvar elmo-imap4-use-lock t
   "USE IMAP4 with locking process.")

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index f283b2a..0380a85 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -30,6 +30,17 @@
 (require 'elmo-util)
 (require 'elmo-vars)
 
+(eval-and-compile
+  (autoload 'starttls-negotiate "starttls")
+  (autoload 'sasl-find-mechanism "sasl")
+  (autoload 'sasl-make-client "sasl")
+  (autoload 'sasl-mechanism-name "sasl")
+  (autoload 'sasl-next-step "sasl")
+  (autoload 'sasl-step-data "sasl")
+  (autoload 'sasl-step-set-data "sasl"))
+
+(defvar sasl-mechanisms)
+
 ;;; Code:
 ;;
 (eval-and-compile

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index f8a18ea..813d31a 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -42,9 +42,7 @@
 (eval-and-compile
   (luna-define-class elmo-nntp-session (elmo-network-session)
                     (current-group))
-  (luna-define-internal-accessors 'elmo-nntp-session)
-  (autoload 'starttls-open-stream "starttls")
-  (autoload 'starttls-negotiate "starttls"))
+  (luna-define-internal-accessors 'elmo-nntp-session))
 
 ;;
 ;; internal variables

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 8e15d5a..648978a 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -33,23 +33,19 @@
 
 (require 'elmo-msgdb)
 (require 'elmo-net)
-(require 'sasl)
 
 (eval-when-compile
-  (require 'elmo-util)
-  (defun-maybe md5 (a)))
+  (require 'elmo-util))
 
 (eval-and-compile
-  (autoload 'starttls-open-stream "starttls")
-  (autoload 'starttls-negotiate "starttls"))
+  (autoload 'md5 "md5"))
 
 (defvar elmo-pop3-use-uidl t
   "*If non-nil, use UIDL.")
 
 (defvar elmo-pop3-exists-exactly t)
 
-(eval-and-compile
-  (luna-define-class elmo-pop3-session (elmo-network-session) ()))
+(luna-define-class elmo-pop3-session (elmo-network-session))
 
 ;; buffer-local
 (defvar elmo-pop3-read-point nil)
@@ -168,7 +164,6 @@
                    (elmo-network-session-greeting-internal session))
       ;; good, APOP ready server
       (progn
-       (require 'md5)
        (elmo-pop3-send-command
         (elmo-network-session-process-internal session)
         (format "apop %s %s"