Added conditional copilation for the configureation parameters.

Updated RELEASE_NOTES. Tested on freebsd and umbuntu linux.
Reset AutoBuild.sh to use internal spf library.

AutoBuild.sh

@@ -43,7 +43,7 @@ fi
 
 autoreconf -v -i
 
-CONF="./configure -q --with-wall -C --with-spf --with-spf2-include=/usr/local/include/spf2 --with-spf2-lib=/usr/local/lib/"
+CONF="./configure -q --with-wall -C --with-spf"
 echo ${CONF}
 perform "$CONF"
 perform "make -s"

RELEASE_NOTES

@@ -6,6 +6,7 @@ release, and a summary of the changes in that release.
 1.3.0		2014/05/??
 	Add configuration support for internal SPF checks.  Inlcudes hooks in
 		the milter to check that SPF is configured to do so.
+		This can use a private SPF impleemntation or libspf2.
 	Feature request #79: Optionally ignore clients that authenticated
 		using SMTP AUTH.
 	Fix bug #60, part II: Default AuthservID to the name provided by the

opendmarc/opendmarc.c

@@ -138,6 +138,7 @@ struct dmarcf_config
 	_Bool			conf_addswhdr;
 	_Bool			conf_authservidwithjobid;
 	_Bool			conf_recordall;
+#if WITH_SPF
 	_Bool			conf_spfignoreresults;
 	_Bool			conf_spfselfvalidate;
 	_Bool			conf_ignoreauthclients;
@@ -2260,7 +2261,11 @@ mlfi_eom(SMFICTX *ctx)
 		/* walk through what was found */
 		for (c = 0; c < ar.ares_count; c++)
 		{
-			if (ar.ares_result[c].result_method == ARES_METHOD_SPF)
+			if (ar.ares_result[c].result_method == ARES_METHOD_SPF
+#if WITH_SPF
+					&& conf->conf_spfignoreresults == FALSE
+#endif
+					)
 			{
 				int spfmode;
 
@@ -2413,7 +2418,11 @@ mlfi_eom(SMFICTX *ctx)
 		}
 	}
 
-	if (!wspf)
+	if (!wspf
+#if WITH_SPF
+		&& conf->conf_spfignoreresults == FALSE
+#endif
+		)
 	{
 		for (hdr = dfc->mctx_hqhead;
 		     hdr != NULL && !wspf;

opendmarc/opendmarc.conf.sample

@@ -297,6 +297,9 @@
 ##  SPFSelfValidate { true | false }
 ##	default false
 ##
+##  Enable internal spf checking with --with-spf
+##  To use libspf2 instead:  --with-spf --with-spf2-include=path --with-spf2-lib=path
+##
 ##  Causes the filter to perform a fallback SPF check itself when
 ##  it can find no SPF results in the message header.  If SPFIgnoreResults
 ##  is also set, it never looks for SPF results in headers and