Added experimental features

[users/jgh/exim.git] / src / src / exim.h

diff --git a/src/src/exim.h b/src/src/exim.h
index c46af2c5862035a863af704050bcf9886124a626..e66f744f9c115d78b8be9c55c9bd54171aa4ad4c 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.2.2.1 2004/11/30 15:18:58 tom Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.2.2.3 2004/12/10 14:59:08 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -379,9 +379,15 @@ extern int ferror(FILE *);
 
 /* Exim includes are in several files. Note that local_scan.h #includes
 mytypes.h and store.h, so we don't need to mention them explicitly. */
+#include "config.h"
+
+/* Before including the rest of the Exim headers, lets clear up some content
+scanning dependencies. */
+#ifdef WITH_OLD_DEMIME
+#define WITH_CONTENT_SCAN
+#endif
 
 #include "local_scan.h"
-#include "config.h"
 #include "macros.h"
 #include "dbstuff.h"
 #include "structs.h"
@@ -390,6 +396,16 @@ mytypes.h and store.h, so we don't need to mention them explicitly. */
 #include "dbfunctions.h"
 #include "osfunctions.h"
 
+#ifdef EXPERIMENTAL_BRIGHTMAIL
+#include "bmi_spam.h"
+#endif
+#ifdef EXPERIMENTAL_SPF
+#include "spf.h"
+#endif
+#ifdef EXPERIMENTAL_SRS
+#include "srs.h"
+#endif
+
 /* The following stuff must follow the inclusion of config.h because it
 requires various things that are set therein. */