Silence smime.el compilation.

* lisp/gnus/smime.el (ldap-search): Declare.
(smime-cert-by-ldap-1): Require ldap on Emacs.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af52b316ea9555781ecd2290a55e2b37dde34546..efc059aefe140388e10b0cd6c7a801977ae3a6d3 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-01  Glenn Morris  <rgm@gnu.org>
 
+       * smime.el (ldap-search): Declare.
+       (smime-cert-by-ldap-1): Require ldap on Emacs.
+
        * nnimap.el: Require nnmail, and gnus-sum when compiling.
        (nnimap-keepalive): Use gnus-float-time.
 

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index e28c07ffaad4e1ee367c3ec64324d708546f1321..acb50f113210adf26d6aa13f782e0d39849a858a 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -587,6 +587,9 @@ A string or a list of strings is returned."
       (kill-buffer digbuf)
       retbuf))
 
+(declare-function ldap-search "ldap"
+                 (filter &optional host attributes attrsonly withdn))
+
 (defun smime-cert-by-ldap-1 (mail host)
   "Get cetificate for MAIL from the ldap server at HOST."
   (let ((ldapresult
@@ -595,7 +598,9 @@ A string or a list of strings is returned."
              (progn
                (require 'smime-ldap)
                'smime-ldap-search)
-           'ldap-search)
+           (progn
+             (require 'ldap)
+             'ldap-search))
          (concat "mail=" mail)
          host '("userCertificate") nil))
        (retbuf (generate-new-buffer (format "*certificate for %s*" mail)))