sync up with slim-1_14

diff --git a/utils/sasl/lisp/md5-dl.el b/utils/sasl/lisp/md5-dl.el
index 4bc12bf..72078c5 100644 (file)
--- a/utils/sasl/lisp/md5-dl.el
+++ b/utils/sasl/lisp/md5-dl.el
@@ -26,6 +26,11 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (defun-maybe md5-string (a))
+  (defun-maybe dynamic-link (a))
+  (defun-maybe dynamic-call (a b)))
+
 (defvar md5-dl-module
   (if (and (fboundp 'md5-string)
           (subrp (symbol-function 'md5-string)))
@@ -61,6 +66,5 @@ hash of a portion of OBJECT."
       (md5-region (or beg (point-min)) (or end (point-max))))))
 
 (provide 'md5-dl)
-(provide 'md5)
 
 ;;; md5-dl.el ends here.

diff --git a/utils/sasl/lisp/md5-el.el b/utils/sasl/lisp/md5-el.el
index a339cec..e7374d8 100644 (file)
--- a/utils/sasl/lisp/md5-el.el
+++ b/utils/sasl/lisp/md5-el.el
@@ -405,4 +405,4 @@ hash of a portion of OBJECT."
            (kill-buffer buffer)))
       (and buffer (buffer-name buffer) (kill-buffer buffer) nil))))
 
-(provide 'md5)
+(provide 'md5-el)

diff --git a/utils/sasl/lisp/md5.el b/utils/sasl/lisp/md5.el
index 634b2f0..55c658b 100644 (file)
--- a/utils/sasl/lisp/md5.el
+++ b/utils/sasl/lisp/md5.el
@@ -58,8 +58,10 @@
  ((and (fboundp 'dynamic-link)
        (file-exists-p (expand-file-name "md5.so" exec-directory)))
   ;; Emacs with DL patch.
-  (require 'md5 "md5-dl"))
+  (require 'md5-dl))
  (t
-  (require 'md5 "md5-el")))
+  (require 'md5-el)))
+
+(provide 'md5)
 
 ;;; md5.el ends here.

diff --git a/utils/sasl/lisp/sasl.el b/utils/sasl/lisp/sasl.el
index 3e78040..dd07f13 100644 (file)
--- a/utils/sasl/lisp/sasl.el
+++ b/utils/sasl/lisp/sasl.el
@@ -82,8 +82,8 @@
   (concat authorid "\0" authenid "\0" passphrase))
 
 ;;; SCRAM-MD5
-(eval-when-compile
-  (defvar sasl-scram-md5-client-security-info
+(defvar sasl-scram-md5-client-security-info
+  (eval-when-compile
     (scram-make-security-info nil t 0)))
 
 (defun sasl-scram-md5-make-salted-pass (server-msg-1 passphrase)
@@ -121,7 +121,7 @@
         client-proof)
       (fillarray client-proof 0))))
             
-(defun sasl-scram-md5-authenticate-server (server-msg-1 
+(defun sasl-scram-md5-authenticate-server (server-msg-1
                                           server-msg-2
                                           client-msg-1
                                           salted-pass)

diff --git a/utils/sasl/lisp/sha1-dl.el b/utils/sasl/lisp/sha1-dl.el
index 06f51a2..7edccdd 100644 (file)
--- a/utils/sasl/lisp/sha1-dl.el
+++ b/utils/sasl/lisp/sha1-dl.el
@@ -27,7 +27,10 @@
 ;;; Code:
 
 (provide 'sha1-dl)                     ; beware of circular dependency.
-(eval-when-compile (require 'sha1))    ; sha1-dl-module.
+(eval-when-compile
+  (require 'sha1)                      ; sha1-dl-module.
+  (defun-maybe dynamic-link (a))
+  (defun-maybe dynamic-call (a b)))
 
 (defvar sha1-dl-handle
   (and (stringp sha1-dl-module)