removed the locate-file mantra

added BBDB eval-when-compile load
removed bbdb-search macro autoload

diff --git a/lisp/spam.el b/lisp/spam.el
index 4dc3098..5feacd2 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -39,10 +39,17 @@
 (require 'dns)
 (require 'message)
 
-;; BBDB autoloads
-(autoload 'bbdb-search "bbdb-com")
 (autoload 'bbdb-records "bbdb-com")
 
+;; Attempt to load BBDB macros
+(eval-when-compile
+  (condition-case nil
+      (require 'bbdb-com)
+    (error)))
+
+;; autoload executable-find
+(autoload 'executable-find "executable")
+
 ;;; Main parameters.
 
 (defvar spam-use-blacklist t
@@ -409,16 +416,6 @@ The regular expression is matched against the address.")
 Markup from spam recognisers, as well as `Xref', are to be removed from
 articles before they get registered by Bogofilter.")
 
-;; FIXME!  I do not know if Gnus has a compatibility function for
-;; `executable-find'.  Here is a possible mantra for portability,
-;; until Lars decides how we really should do it.
-(unless (fboundp 'executable-find)
-  (if (fboundp 'locate-file)
-      (defun executable-find (command)
-       (locate-file command exec-path))
-    (autoload 'executable-find "executable")))
-;; End of portability mantra for `executable-find'.
-
 (defvar spam-bogofilter-path (executable-find "bogofilter")
   "File path of the Bogofilter executable program.
 Force this variable to nil if you want to inhibit the functionality.")