--- spam.el~	2002-10-08 21:52:36 +0000
+++ spam.el	2002-10-09 01:00:36 +0000
@@ -40,9 +40,14 @@
 (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)))
+
 ;;; Main parameters.
 
 (defvar spam-use-blacklist t