Update to version 2.53.

  This also closes PR pkg/21114 (thanks to Todd Vierling for dynamic PLIST)

  Most serious bugs since release of SA 2.50 fixed (hence the 'long'
  delay for the Pkgsrc package).

  Dependence on procmail removed. You still need a mail delivery agent
  but procmail is only a recommendation, not a prerequisite.

  Runs on Solaris (somewhat tested on Solaris 8, feedback welcome).

  Includes some SSL support for spamc/spamd. Not yet recommended due to
  lurking bug(s) (SA bugzilla ID 1751).

  Uses Perl module DB_File now instead of NDBM_File. This changes the
  name and format of the auto-whitelist database  ('auto-whitelist'
  instead of 'auto-whitelist.db' on NetBSD).

  ! This release adds/changes/removes configuration options, PLEASE use !
  ! 'perldoc Mail::SpamAssassin::Conf' and make  sure your mail         !
  ! configuration still works as expected.                              !

==========================================================================

Changes since 2.52:

- corruption of Bayes db where nspam/nham was getting zeroed, fixed.

- Bayes now has much lower lock timeouts for opportunistic expiry
  and auto-learning, to avoid overloading busy servers with an expiry
  run.  (This may result in occasional "lock failed" messages in the
  syslog while you're doing manual sa-learn ops, but those are
  not serious; it just means that an auto-learn could not take place
  because the dbs were opened by you in another process.)

- NDBM_File does not provide an EXISTS method, worked around.

- BSMTP support (spamc -B) fixed.

- Bayes allowed the user to 'forget' messages they hadn't learned.

- sa-learn broken when installed in a non-standard location.

- spamc was failing to dump message if out of memory.

- add-all-addrs-to-blacklist was a no-op, fixed.

- syslog-socket support was broken, fixed.

- sslspamc compilation fixed.

- SIGCHLD handling in spamd was causing an ugly warning on Red Hat 8.

- user_prefs were left world-writable after auto-whitelist use.

- Razor was zeroing %ENV; protected against this.

- some test failures on 5.005 and with Razor fixed; some tests were
  also still using the user's Bayes dbs.

- Windows portability fix in new Bayes journal code.

- dialup_codes now a privileged setting.

- clean PATH env variable immediately upon spamd start; fixed problem
  with taint mode failures when getting hostname in Perl 5.005.

- NetBSD: fixed SSL support, spamd start script.

- single-Received-header mails were not getting DNSBL checks.

- some doco fixes.


Changes since 2.51:

  - bug 1664: expiry imposed way too much load when a single
    site-wide Bayes db was used, fixed
  - bug 1672: a typo in a backported patch for 2.51 caused Bayes to
    sometimes not unlock the db, fixed
  - INSTALL now strongly recommends using DB_File
  - some NetBSD support fixes
  - bug 1601: option --syslog-socket wasn't implemented
  - bug 1260: corrected description of --nocreate-prefs option


Changes since 2.50:

  - Bayes locking and concurrency issues fixed
  - Bayes expiration was not working; fixed
  - spamd was not enabling Bayes after auto-learning without restart;
    fixed
  - safer way to attach spams, for broken mail clients, using 'report_safe
    2'
  - a few doco cleanups


Main changes since 2.4x:

- Bayesian filtering, using a Bayesian-style form of probability-analysis
  classification.  This uses an algorithm based on the one detailed in
  Paul Graham's 'A Plan For Spam' paper, along with aspects taken from
  Graham Robinson's work, and the chi-combining technique developed by the
  SpamBayes project.

- Auto-learning.  This trains the Bayesian filter automatically, based on
  the results from traditional SpamAssassin diagnosis.   It uses a set of
  heuristics and separate thresholds to ensure (as much as is possible)
  that it trains on guaranteed non-spam and spam.   Old, unused tokens are
  automatically expired.

- much-improved rule set.  A whole new set of rules based on Message-Id
  analysis is now in place, which accurately detects forged headers from
  a wide range of spamware.   Many inaccurate rules have been dropped.
  HTML tests much improved, with a set to detect image-only spam.

- new default format for detected-spam messages; the message is
  encapsulated as a MIME part, with a preview and the spam report
  in the main part of the message.

- Score sets.  Based on whether you are using just SpamAssassin rules,
  adding network tests, and using a trained Bayesian database,
  SpamAssassin will use a set of scores appropriately to gain the
  maximum degree of accuracy.

- Italian, Polish, Spanish, French and German rule sets and translations.

- Much improved reliability with spamd.  The problems with signals
  have been cleared up thanks to a pipe-based child tracking system,
  and all spamd-hanging bugs reported have proved unreproducable.

- Unicode problems with Red Hat 8 and perl 5.8 fixed.   Works on Perl
  5.005, 5.6.x, and 5.8.x.

- Taint-safe.  SpamAssassin runs with perl's taint-checking enabled for
  better security.

- Razor 1 support is now officially deprecated.

- "spamc -c" was not working, fixed.  This fix required increasing the
  revision of the spamd protocol; only difference is that now more than
  one protocol header can appear in the reply from spamd.

- all fixes from 2.44 included.

18 files changed, 1693 insertions, 282 deletions

diff --git a/mail/spamassassin/DESCR b/mail/spamassassin/DESCR
index 8836f99fa58..2cce54fae9d 100644
--- a/mail/spamassassin/DESCR
+++ b/mail/spamassassin/DESCR
@@ -7,7 +7,8 @@ Once identified, the mail can then be optionally tagged as spam for
 later filtering using the user's own mail user-agent application.
 
 The spam-identification tactics used include header analysis, text
-analysis, blacklists and Razor.
+analysis, a Bayesian-style form of probability-analysis classification,
+blacklists and Razor.
 
 The distribution provides a command line tool to perform filtering,
 along with Mail::SpamAssassin, a set of perl modules which implement a
diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index 47f3a380051..d65ee2d3ee7 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,16 +1,25 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/10/08 00:49:18 heinz Exp $
+$NetBSD: MESSAGE,v 1.4 2003/04/15 00:02:24 heinz Exp $
 
 ***IMPORTANT***
 
-  Starting with version 2.40 SpamAssassin does NOT deliver mail anymore.
-  If you relied on spamassassin to write the mail into your mail folder,
-  you'll have to change your setup to use some local mail delivery agent,
-  e.g. pkgsrc/mail/procmail.
+  Version 2.53 changes the default tagging behavior. SpamAssassin will now
+  create a new report message and attach the original spam message as a
+  MIME part (use the "report_safe" option to change this).
 
-More information can be found in 
-  ${PREFIX}/share/doc/spamassassin/
+  Some configuration options were changed (see Mail::SpamAssassin::Conf).
+  Please check that your existing mail configuration still works.
+
+  On NetBSD, the name of the auto-whitelist database file has changed and
+  the auto-whitelist will be created from scratch.
+
+  SpamAssassin does NOT deliver mail anymore. You _must_ use some local
+  mail delivery agent, eg pkgsrc/mail/procmail.
 
-and via 'man spamassassin' and 'perldoc Mail::SpamAssassin::Conf'
+More information can be found in the man pages for 'spamassassin',
+'sa-learn', 'spamc' and 'spamd', with 'perldoc Mail::SpamAssassin::Conf'
+and in
+
+  ${PREFIX}/share/doc/spamassassin/
 
 ===========================================================================
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index fd3d29d1e78..2ade466ca32 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/02/09 02:27:54 heinz Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/15 00:02:24 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-2.44
-PKGNAME=	spamassassin-2.44
-PKGREVISION=	1
+DISTNAME=	Mail-SpamAssassin-2.53
+PKGNAME=	spamassassin-2.53
+PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
@@ -12,55 +12,83 @@ MAINTAINER=	heinz-sa@netbsd.org
 HOMEPAGE=	http://www.spamassassin.org/
 COMMENT=	mail filter to identify spam
 
-DEPENDS+=	procmail>=3.22:../../mail/procmail
+.include "../../mk/bsd.prefs.mk"
 DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
 DEPENDS+=	p5-HTML-Parser>=3.0:../../www/p5-HTML-Parser
 DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 DEPENDS+=	p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
+.if ${OPSYS} == "SunOS"
+DEPENDS+=	p5-DB_File-[0-9]*:../../databases/p5-DB_File
+.endif
+
+.if defined(SPAMASSASSIN_USE_SSL) && ${SPAMASSASSIN_USE_SSL} == "YES"
+DEPENDS+=		p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
+CONFIGURE_ARGS+=	--enable-ssl
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
 
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 
+BUILD_DEFS+=		SPAMASSASSIN_USE_SSL
+
 CONFLICTS=		p5-Mail-SpamAssassin-[1-9]*
 
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR=	spamassassin
 
-PERL5_CONFIGURE=	NO
-MAKE_PARAMS=		SYSCONFDIR="${PKG_SYSCONFDIR}"
+PLIST_ADD=		${WRKSRC}/.PLIST_ADD
+PLIST_SRC=		${PKGDIR}/PLIST ${PLIST_ADD}
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/SpamAssassin/.packlist
 
+PERL5_CONFIGURE=	NO # need GNU_CONFIGURE "do-configure" target
+MAKE_PARAMS=		SYSCONFDIR="${PKG_SYSCONFDIR}"
+MAKE_PARAMS+=		LOCAL_RULES_DIR="${PKG_SYSCONFDIR}"
+MAKE_PARAMS+=		RUN_RAZOR1_TESTS="y" RUN_RAZOR2_TESTS="y"
+
+OWN_DIRS+=		${PKG_SYSCONFDIR}/certs
+
 RCD_SCRIPTS=		spamd
 RCD_SCRIPT_SRC.spamd=	${WRKDIR}/${DISTNAME}/spamd/netbsd-rc-script.sh
 
 EGDIR=			${PREFIX}/share/examples/spamassassin
-DOCDIR=			${PREFIX}/share/doc/spamassassin
+DOCDIRNOPREFIX=		share/doc/spamassassin
+DOCDIR=			${PREFIX}/${DOCDIRNOPREFIX}
 RULESDIR=		${PREFIX}/share/spamassassin
 
 CONF_FILES+=		${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf
-CONF_FILES+=		${PREFIX}/share/spamassassin/user_prefs.template\
+CONF_FILES+=		${PREFIX}/share/spamassassin/user_prefs.template \
 			  ${PKG_SYSCONFDIR}/user_prefs.template
 SUPPORT_FILES_PERMS+=	${EGDIR}/netbsd_lists.cf			\
 			  ${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN}	\
 			  ${SHAREGRP} ${SHAREMODE}
 
-.include "../../mk/bsd.prefs.mk"
-# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
-.if ${OS_VERSION:M1.[0-5]*}
-INTERPRETER_SUPPORT=NO
-.else
-INTERPRETER_SUPPORT=YES
+.if ${OPSYS} == "NetBSD"
+#  the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
+.  if ${OS_VERSION:M1.[0-5]*}
+     INTERPRETER_SUPPORT=NO
+.  else
+     INTERPRETER_SUPPORT=YES
+.  endif
 .endif
-FILES_SUBST+=		INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
+FILES_SUBST+=		INTERPRETER_SUPPORT="${INTERPRETER_SUPPORT}"
+FILES_SUBST+=		OPSYS="${OPSYS}"
 
 TEST_TARGET=	test
 
-pre-configure: perl5-configure
-
-post-configure:
-.for f in INSTALL README lib/Mail/SpamAssassin/Conf.pm			\
-	  spamd/README.spamd-vpopmail sql/README
+post-extract:
+	@# correct bad SA permissions
+	@${CHMOD} a-x ${WRKSRC}/License
+	@${CHMOD} a-x ${WRKSRC}/lib/Mail/SpamAssassin/*.pm
+	@${CHMOD} a-x ${WRKSRC}/rules/20_uri_tests.cf
+	@${CHMOD} a+x ${WRKSRC}/masses/uniq-scores
+	@${CHMOD} a+x ${WRKSRC}/tools/translation_prep.pl
+
+post-patch:
+.for f in INSTALL README USAGE lib/Mail/SpamAssassin/Conf.pm		\
+	  spamd/README.spamd spamd/README.spamd-vpopmail sql/README
 	@${SED} -e "s,/usr/share,${PREFIX}/share,g"			\
 		-e "s,/usr/bin,${PREFIX}/bin,g"				\
 		-e "s,/usr/lib,${PREFIX}/lib,g"				\
@@ -69,51 +97,78 @@ post-configure:
 	  ${MV} ${WRKSRC}/${f}.fixed ${WRKSRC}/${f}
 .endfor
 
+pre-configure: perl5-configure
+
+.if defined(SPAMASSASSIN_USE_SSL) && ${SPAMASSASSIN_USE_SSL} == "YES"
+post-build:
+	@(cd ${WRKSRC}; \
+	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} spamd/sslspamc )
+.endif
+
 pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-.for d in masses/lib/Mail spamd sql tools
-	${INSTALL_DATA_DIR}  ${DOCDIR}/$d
-.endfor
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/html/spamassassin
-	${INSTALL_DATA} ${WRKSRC}/ninjabutton.png                       \
+	@-${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
+	@${INSTALL_DATA_DIR} ${EGDIR}
+	@${INSTALL_DATA_DIR} ${DOCDIR}/spamd
+	@${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/html/spamassassin
+	@ # ninja image is in the static PLIST
+	@${INSTALL_DATA} ${WRKSRC}/ninjabutton.png                       \
 	  ${PREFIX}/share/doc/html/spamassassin/
-.for f in INSTALL License README TRADEMARK sample-nonspam.txt		\
-	  sample-spam.txt sql/README sql/spamassassin.sql		\
-	  spamd/README.spamd spamd/README.spamd-vpopmail
-	${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
+.for f in CONTRIB_CERT COPYRIGHT INSTALL License README TRADEMARK USAGE	\
+	  sample-nonspam.txt sample-spam.txt spamd/README.spamd		\
+	  spamd/README.spamd-vpopmail
+	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
+	@${ECHO} "${DOCDIRNOPREFIX}/$f" >> ${PLIST_ADD}
+.endfor
+	@${ECHO} "@dirrm ${DOCDIRNOPREFIX}/spamd" >> ${PLIST_ADD}
+.for f in STATISTICS.txt STATISTICS-set1.txt STATISTICS-set2.txt	\
+	  STATISTICS-set3.txt
+	@${INSTALL_DATA} ${WRKSRC}/rules/$f ${DOCDIR}/
+	@${ECHO} "${DOCDIRNOPREFIX}/$f" >> ${PLIST_ADD}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/rules/STATISTICS.txt ${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/masses/lib/Mail/ArchiveIterator.pm	\
-	  ${DOCDIR}/masses/lib/Mail/ArchiveIterator.pm
-	@(cd ${WRKSRC}/masses/;						\
-	  for f in *; do						\
+.for DIR in masses qmail sql tools
+	@(cd ${WRKSRC} &&						\
+	  for d in `${FIND} ${DIR} -type d -print`; do			\
+	    ${INSTALL_DATA_DIR} ${DOCDIR}/$$d;				\
+	  done &&							\
+	  for f in `${FIND} ${DIR} -type f -print`; do			\
 	    if ${TEST} -f $$f; then					\
 	      if ${TEST} -x $$f ; then					\
-		${SED} -e "1s,/usr/bin/perl,${PERL5}," < $$f		\
+		${SED} -e "1s,/usr/bin/perl,${PERL5},"			\
+		       -e "1s,/usr/local/bin/perl,${PERL5}," < $$f	\
 		  > $${f}.fixed && ${MV} $${f}.fixed $$f &&		\
 		  ${CHMOD} +x $$f &&					\
-		  ${INSTALL_SCRIPT} $$f ${DOCDIR}/masses/$$f;		\
+		  ${INSTALL_SCRIPT} $$f ${DOCDIR}/$$f;			\
 	      else							\
-		${INSTALL_DATA} $$f ${DOCDIR}/masses/$$f;		\
-	      fi;							\
+		${INSTALL_DATA} $$f ${DOCDIR}/$$f;			\
+	      fi &&							\
+	      ${ECHO} "${DOCDIRNOPREFIX}/$$f" >> ${PLIST_ADD};		\
 	    fi;								\
+	  done &&							\
+	  for d in `${FIND} ${DIR} -type d -print`; do			\
+	    ${ECHO} "@dirrm ${DOCDIRNOPREFIX}/$$d" >> ${PLIST_ADD};	\
 	  done)
-	${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/procmailrc.example
-	${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/local.cf
-	${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}/
-.for f in check_whitelist speedtest translation_prep.pl
-	@(cd ${WRKSRC}/tools/;						\
-	  ${SED} -e "1s,/usr/bin/perl,${PERL5},"			\
-		 -e "1s,/usr/local/bin/perl,${PERL5}," < $f		\
-	    > ${f}.fixed && ${MV} ${f}.fixed $f;			\
-	  ${INSTALL_SCRIPT} $f ${DOCDIR}/tools/$f )
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/tools/README.speedtest		\
-	  ${DOCDIR}/tools/README.speedtest
+	@${ECHO} "@dirrm ${DOCDIRNOPREFIX}" >> ${PLIST_ADD}
+	@(cd ${WRKSRC}/rules &&						\
+	  for f in [0-9]*.cf; do					\
+	    ${ECHO} "share/spamassassin/$$f" >> ${PLIST_ADD};		\
+	  done)
+	@${ECHO} "@dirrm share/spamassassin" >> ${PLIST_ADD}
+	@ #  examples are in the static PLIST
+	@${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/
+	@${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}/
 
 post-install:
-	${CHOWN} ${SHAREOWN} ${RULESDIR}/*
-	${CHGRP} ${SHAREGRP} ${RULESDIR}/*
+	@${CHOWN} ${SHAREOWN} ${RULESDIR}/*
+	@${CHGRP} ${SHAREGRP} ${RULESDIR}/*
+	@${CHMOD} a=r ${RULESDIR}/*
+.if defined(SPAMASSASSIN_USE_SSL) && ${SPAMASSASSIN_USE_SSL} == "YES"
+	@${INSTALL_PROGRAM} ${WRKSRC}/spamd/sslspamc ${PREFIX}/bin/
+	@${ECHO} "bin/sslspamc" >> ${PLIST_ADD}
+
+.include "../../security/openssl/buildlink2.mk"
+.endif
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index fc61dd2005c..bafff96f9c6 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,78 +1,12 @@
-@comment $NetBSD: PLIST,v 1.9 2002/10/20 20:09:05 heinz Exp $
-@comment bin/spamassassin
-@comment bin/spamc
-@comment bin/spamd
+@comment $NetBSD: PLIST,v 1.10 2003/04/15 00:02:24 heinz Exp $
+@comment Most of this PLIST is auto-generated; see Makefile.
 etc/rc.d/spamd
-@comment etc/spamassassin/local.cf
-@comment etc/spamassassin/netbsd_lists.cf
-@comment etc/spamassassin/user_prefs.template
 share/doc/html/spamassassin/ninjabutton.png
-share/doc/spamassassin/INSTALL
-share/doc/spamassassin/License
-share/doc/spamassassin/README
-share/doc/spamassassin/STATISTICS.txt
-share/doc/spamassassin/TRADEMARK
-share/doc/spamassassin/masses/CORPUS_POLICY
-share/doc/spamassassin/masses/CORPUS_SUBMIT
-share/doc/spamassassin/masses/README
-share/doc/spamassassin/masses/craig-evolve.c
-share/doc/spamassassin/masses/fp-fn-statistics
-share/doc/spamassassin/masses/freqdiff
-share/doc/spamassassin/masses/hit-frequencies
-share/doc/spamassassin/masses/lib/Mail/ArchiveIterator.pm
-share/doc/spamassassin/masses/lint-rules-from-freqs
-share/doc/spamassassin/masses/logs-to-c
-share/doc/spamassassin/masses/mass-check
-share/doc/spamassassin/masses/mass-check.cf
-share/doc/spamassassin/masses/mk-baseline-results
-share/doc/spamassassin/masses/parse-rules-for-masses
-share/doc/spamassassin/masses/post-ga-analysis.pl
-share/doc/spamassassin/masses/rewrite-cf-with-new-scores
-share/doc/spamassassin/masses/score-ranges-from-freqs
-share/doc/spamassassin/masses/true-false-pos-neg-filter.pl
-share/doc/spamassassin/sample-nonspam.txt
-share/doc/spamassassin/sample-spam.txt
-share/doc/spamassassin/spamd/README.spamd
-share/doc/spamassassin/spamd/README.spamd-vpopmail
-share/doc/spamassassin/sql/README
-share/doc/spamassassin/sql/spamassassin.sql
-share/doc/spamassassin/tools/README.speedtest
-share/doc/spamassassin/tools/check_whitelist
-share/doc/spamassassin/tools/speedtest
-share/doc/spamassassin/tools/translation_prep.pl
+@dirrm share/doc/html/spamassassin
 share/examples/spamassassin/local.cf
 share/examples/spamassassin/netbsd_lists.cf
 share/examples/spamassassin/procmailrc.example
-share/spamassassin/10_misc.cf
-share/spamassassin/20_anti_ratware.cf
-share/spamassassin/20_body_tests.cf
-share/spamassassin/20_compensate.cf
-share/spamassassin/20_head_tests.cf
-share/spamassassin/20_meta_tests.cf
-share/spamassassin/20_ratware.cf
-share/spamassassin/20_uri_tests.cf
-share/spamassassin/25_body_tests_es.cf
-share/spamassassin/25_body_tests_pl.cf
-share/spamassassin/25_head_tests_es.cf
-share/spamassassin/25_head_tests_pl.cf
-share/spamassassin/30_text_de.cf
-share/spamassassin/30_text_es.cf
-share/spamassassin/30_text_fr.cf
-share/spamassassin/30_text_pl.cf
-share/spamassassin/40_spam_phrases.cf
-share/spamassassin/50_scores.cf
-share/spamassassin/60_whitelist.cf
 share/spamassassin/languages
 share/spamassassin/triplets.txt
 share/spamassassin/user_prefs.template
-@dirrm share/spamassassin
 @dirrm share/examples/spamassassin
-@dirrm share/doc/spamassassin/tools
-@dirrm share/doc/spamassassin/sql
-@dirrm share/doc/spamassassin/spamd
-@dirrm share/doc/spamassassin/masses/lib/Mail
-@dirrm share/doc/spamassassin/masses/lib
-@dirrm share/doc/spamassassin/masses
-@dirrm share/doc/spamassassin
-@dirrm share/doc/html/spamassassin
-@comment @dirrm etc/spamassassin
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 1482219bec7..691a6628dcc 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.12 2003/02/09 02:55:41 heinz Exp $
+$NetBSD: distinfo,v 1.13 2003/04/15 00:02:24 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-2.44.tar.gz) = f5f1289b2ce29ff656f83c5f90908a6abf486606
-Size (Mail-SpamAssassin-2.44.tar.gz) = 525059 bytes
-SHA1 (patch-ab) = df905aebb1e374a549808a5b925fbf9511dc3333
-SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636
-SHA1 (patch-ad) = 41a0130905fe000613a963acd7bb7cc8e743469c
-SHA1 (patch-ae) = 4866c0c3d6478671d67d2a83548a0a1b9603b8e7
-SHA1 (patch-ag) = 59ae0f4f338d17ede8a944c99b1ad5437a6694c0
-SHA1 (patch-ah) = 5b2af5a9304857aaf4569414144e6b99066d73e2
-SHA1 (patch-ai) = 02129dfc207ec05402a11e2e1c535e59953459b4
+SHA1 (Mail-SpamAssassin-2.53.tar.gz) = 568d8c05cea13c1daa0be9ba2cfcd99f60e660b8
+Size (Mail-SpamAssassin-2.53.tar.gz) = 700518 bytes
+SHA1 (patch-ab) = 0283d2c289d933ee165648d15f70a6a05a7bfddf
+SHA1 (patch-ae) = 97f9691c71d35274a21dc5710e5cfb273ecb0f63
+SHA1 (patch-aj) = a0e1f3d04d17ef7010214e9af4036c94c040a42e
+SHA1 (patch-ak) = 39dee2951b24b26f12150cd12efc3eee9c1ed569
+SHA1 (patch-al) = fe02e20d8c3fec4dad2e70daad1d6fa5bd25cab6
+SHA1 (patch-am) = 92c0263112b8d164d306b1563ad3d4e2a6d118c2
+SHA1 (patch-an) = 1da8574e8cb74d0bec2918d61967fa236436f3eb
+SHA1 (patch-ao) = ea46624d614412f5eb259282f5ef6ff5f1229d95
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 6dcb8689dde..f665d904b42 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,51 +1,26 @@
-$NetBSD: patch-ab,v 1.2 2002/10/20 20:09:05 heinz Exp $
+$NetBSD: patch-ab,v 1.3 2003/04/15 00:02:25 heinz Exp $
 
---- Makefile.PL.orig	Mon Oct 14 18:44:27 2002
+--- Makefile.PL.orig	Sun Mar 30 03:55:30 2003
 +++ Makefile.PL
-@@ -134,8 +134,8 @@
- DEF_RULES_DIR           = $(INST_PREFIX)/share/spamassassin
- PKG_DEF_RULES_DIR	= $(PREFIX)/share/spamassassin
- 
--LOCAL_RULES_DIR         = $(INST_SYSCONFDIR)/mail/spamassassin
--PKG_LOCAL_RULES_DIR	= $(SYSCONFDIR)/mail/spamassassin
-+LOCAL_RULES_DIR         = $(INST_SYSCONFDIR)
-+PKG_LOCAL_RULES_DIR	= $(SYSCONFDIR)
- 
- FIXVARS		= -Mvars \
- 		  -DVERSION="$(VERSION)" \
-@@ -144,7 +144,7 @@
- 		  -DLOCAL_RULES_DIR="$(LOCAL_RULES_DIR)" \
- 		  -DINSTALLSITELIB="$(INSTALLSITELIB)"
- 
--pm_to_blib: spamassassin doc/.made
-+pm_to_blib: spamassassin
- 
- spamassassin: spamassassin.raw
- 	$(PERL) build/preprocessor $(FIXVARS) -Msharpbang <$? >$@
-@@ -163,7 +163,7 @@
- binaries.mk: configure
+@@ -334,16 +334,17 @@
  	./configure
  
--inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
-+inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR)
- 	$(RM_F) $(PKG_DEF_RULES_DIR)/*; \
- 	for file in $(RULES) ; do \
- 	  $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(PKG_DEF_RULES_DIR)/$$file; \
-@@ -171,13 +171,14 @@
- 	$(CHMOD) $(PERM_RW) $(PKG_DEF_RULES_DIR)/*
- 
- $(PKG_DEF_RULES_DIR):
--	$(MKPATH) $@
-+	$(BSD_INSTALL_DATA_DIR) $@
+ inst_cfs: $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
+-	$(MKPATH) $(PKG_DEF_RULES_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(PKG_DEF_RULES_DIR)
+ 	$(RM_RF) $(PKG_DEF_RULES_DIR)/*
+ 	$(PERL) build/preprocessor $(FIXVARS) -Irules -O$(PKG_DEF_RULES_DIR) $(RULES)
+-	$(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
++	@ \# $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
  
  $(PKG_LOCAL_RULES_DIR):
 -	$(MKPATH) $@
 +	$(BSD_INSTALL_DATA_DIR) $@
  
  $(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf
--	test -f $@ || \
-+	\# manage local.cf through pkgsrc .mk files
-+	\# test -f $@ || \
- 	  $(CP) rules/local.cf $@
+-	$(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
++	@ \# manage local.cf through pkgsrc .mk files
++	@ \# $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
  
- text_html_doc: doc/.made
+ text_html_doc: made-doc-stamp
+ 	$(NOOP)
diff --git a/mail/spamassassin/patches/patch-ac b/mail/spamassassin/patches/patch-ac
deleted file mode 100644
index cb6e5cd7341..00000000000
--- a/mail/spamassassin/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/10/20 20:09:05 heinz Exp $
-
---- spamassassin.raw.orig	Fri Oct  4 14:54:12 2002
-+++ spamassassin.raw
-@@ -493,11 +493,11 @@
- configuration files.
- 
- By default, configuration data is loaded from the first existing directory in:
--F</usr/local/share/spamassassin>;F</usr/share/spamassassin>;F<./rules>;F<../rules>
-+F<./rules>;F<../rules>;F<@@DEF_RULES_DIR@@>;F<@@PREFIX@@/share/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>.
- 
- The configuration data in the first existing directory in:
--F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
--are used to override any values which had already been set
-+F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F</@@PREFIX@@/etc/spamassassin>;F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
-+are used to override any values which had already been set.
- 
- Spamassassin will read *.cf in these directories, in alphanumeric order within each directory
- (similar to SysV-style startup scripts).  In other words, it will read F<10_misc.cf> before F<50_scores.cf> and F<20_body_tests.cf> before F<20_head_test.cf>.  Options in later files will override earlier files.
-@@ -506,7 +506,7 @@
- the file specified in the B<-p> argument.  If this is not specified,
- F<~/.spamassassin/user_prefs> is used if it exists.  C<spamassassin> will create this
- file if it does not exist, using F<user_prefs.template> as a template.  This file will be looked for in 
--F</etc/spamassassin/user_prefs.template>;F</usr/local/share/spamassassin/user_prefs.template>;F</usr/share/spamassassin/user_prefs.template>
-+F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F<@@PREFIX@@/share/spamassassin>;F</etc/spamassassin>;F</etc/mail/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>
- 
- =head1 TAGGING
- 
diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad
deleted file mode 100644
index bf597d76ecd..00000000000
--- a/mail/spamassassin/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/11/06 21:51:26 heinz Exp $
-
---- spamd/netbsd-rc-script.sh.orig	Thu Sep 26 12:50:26 2002
-+++ spamd/netbsd-rc-script.sh
-@@ -1,2 +1,2 @@
--#! /bin/sh
-+#!@RCD_SCRIPTS_SHELL@
- #
-@@ -13,2 +13,3 @@
- # BEFORE: mail
-+# KEYWORD: shutdown
- 
-@@ -34,6 +35,6 @@
- # default values, may be overridden by setting them in /etc/rc.conf
--spamd_flags="-H -c -a"
--spamd=NO
-+spamd_flags=${spamd_flags-"-H -c -a"}
-+spamd=${spamd:-NO}
- 
--INTERPRETER_SUPPORT=@INTERPRETER_SUPPORT@
-+INTERPRETER_SUPPORT=@INTERPRETER_SUPPORT@ # set during package build
- 
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index cb3ff869986..de342b5aa8a 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2003/02/02 19:38:40 heinz Exp $
+$NetBSD: patch-ae,v 1.4 2003/04/15 00:02:25 heinz Exp $
 
---- spamd/spamd.raw.orig	Fri Jan 31 15:49:03 2003
+--- spamd/spamd.raw.orig	Fri Mar 28 22:26:44 2003
 +++ spamd/spamd.raw
-@@ -837,7 +837,8 @@
+@@ -979,7 +979,8 @@
  use POSIX 'setsid';
  sub daemonize
  {
--    $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
+-    $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
 +    # no pretty 'ps' command line (easier for NetBSD rc script)
-+    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
++    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
      chdir '/' or die "Can't chdir to '/': $!";
      $SIG{__WARN__} = sub { logmsg($_[0]); };
      open STDIN,'/dev/null' or die "Can't read '/dev/null': $!";
diff --git a/mail/spamassassin/patches/patch-ag b/mail/spamassassin/patches/patch-ag
deleted file mode 100644
index f51ac63f75e..00000000000
--- a/mail/spamassassin/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/02/02 19:38:40 heinz Exp $
-
---- lib/Mail/SpamAssassin/Dns.pm.orig	Wed Nov 27 17:45:19 2002
-+++ lib/Mail/SpamAssassin/Dns.pm
-@@ -390,6 +390,12 @@
-         my $objects = $rc->prepare_objects( \@msg )
-           or die "error in prepare_objects";
-         $rc->get_server_info() or die $rc->errprefix("checkit");
-+
-+	# let's reset the alarm since get_server_info() calls
-+	# nextserver() which calls discover() which very likely will
-+	# reset the alarm for us ... how polite.  :(  
-+	alarm $timeout;
-+
-         my $sigs = $rc->compute_sigs($objects)
-           or die "error in compute_sigs";
- 
diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah
deleted file mode 100644
index 9b2a7ed6c20..00000000000
--- a/mail/spamassassin/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/02/02 19:38:40 heinz Exp $
-
---- lib/Mail/SpamAssassin/Reporter.pm.orig	Wed Nov 27 17:45:21 2002
-+++ lib/Mail/SpamAssassin/Reporter.pm
-@@ -152,6 +152,12 @@
-         my $objects = $rc->prepare_objects( \@msg )
-           or adie ("error in prepare_objects");
-         $rc->get_server_info() or adie $rc->errprefix("reportit");
-+
-+	# let's reset the alarm since get_server_info() calls
-+	# nextserver() which calls discover() which very likely will
-+	# reset the alarm for us ... how polite.  :(  
-+	alarm $timeout;
-+
-         my $sigs = $rc->compute_sigs($objects)
-           or adie ("error in compute_sigs");
- 
diff --git a/mail/spamassassin/patches/patch-ai b/mail/spamassassin/patches/patch-ai
deleted file mode 100644
index 6a07ce26ba5..00000000000
--- a/mail/spamassassin/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/02/09 02:27:54 heinz Exp $
-
---- spamd/libspamc.c.orig	Fri Jan 31 15:49:03 2003
-+++ spamd/libspamc.c
-@@ -371,7 +371,6 @@
-     if(i<0 || len >= bufsiz){ free(m->out); m->out=m->msg; m->out_len=m->msg_len; return EX_OSERR; }
- 
-     if((i=try_to_connect(addr, &sock))!=EX_OK){
--        free(buf);
-         free(m->out); m->out=m->msg; m->out_len=m->msg_len;
-         return i;
-     }
diff --git a/mail/spamassassin/patches/patch-aj b/mail/spamassassin/patches/patch-aj
new file mode 100644
index 00000000000..477ab87aaaa
--- /dev/null
+++ b/mail/spamassassin/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- t/spamd_utf8.t.orig	Wed Dec 18 22:41:11 2002
++++ t/spamd_utf8.t
+@@ -4,7 +4,7 @@
+ use SATest; sa_t_init("spamd_utf8");
+ use Test; BEGIN { plan tests => 3 };
+ 
+-$ENV{'LANG'} = 'en_US.utf8';	# ensure we test in UTF-8 locale
++$ENV{'LANG'} = 'en_US.UTF-8';	# ensure we test in UTF-8 locale
+ 
+ # ---------------------------------------------------------------------------
+ 
diff --git a/mail/spamassassin/patches/patch-ak b/mail/spamassassin/patches/patch-ak
new file mode 100644
index 00000000000..0268bf552dd
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig	Fri Mar 28 22:26:12 2003
++++ lib/Mail/SpamAssassin/DBBasedAddrList.pm
+@@ -5,7 +5,8 @@
+ use Fcntl;
+ 
+ # tell AnyDBM_File to prefer DB_File, if possible.
+-# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
++# Pkgsrc: enable following line because BayesStore.pm already broke the rule
++BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
+ # off until 3.0; there's lots of existing AWLs out there this breaks.
+ 
+ use AnyDBM_File;
diff --git a/mail/spamassassin/patches/patch-al b/mail/spamassassin/patches/patch-al
new file mode 100644
index 00000000000..710a6998122
--- /dev/null
+++ b/mail/spamassassin/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- tools/check_whitelist.orig	Thu Dec 19 20:05:01 2002
++++ tools/check_whitelist
+@@ -5,7 +5,8 @@
+ 
+ # must match line at top of lib/Mail/SpamAssassin/DBBasedAddrList.pm.
+ # now off until 3.0
+-# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
++# Pkgsrc: enable following line because BayesStore.pm already broke the rule
++BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
+ 
+ use AnyDBM_File ;
+ use vars qw( %h $k $v ) ;
diff --git a/mail/spamassassin/patches/patch-am b/mail/spamassassin/patches/patch-am
new file mode 100644
index 00000000000..2a6594be2f8
--- /dev/null
+++ b/mail/spamassassin/patches/patch-am
@@ -0,0 +1,26 @@
+$NetBSD: patch-am,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- binaries.mk.in.orig	Thu Dec 19 14:19:08 2002
++++ binaries.mk.in
+@@ -4,6 +4,7 @@
+ CCDLFLAGS = @CCDLFLAGS@
+ 
+ LIBS = @LIBS@
++SSLLIBS = @SSLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LDDLFLAGS = @LDDLFLAGS@
+ 
+@@ -33,11 +34,11 @@
+ 
+ spamd/sslspamc$(EXE_EXT): $(SPAMC_FILES) $(LIBSPAMC_FILES)
+ 	$(CC) $(SSLCFLAGS) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) \
+-		-o $@ $(LDFLAGS) $(LIBS)
++		-o $@ $(LDFLAGS) $(SSLLIBS) $(LIBS)
+ 
+ spamd/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
+ 	$(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
+-		-o $@ $(LDDLFLAGS) $(LIBS)
++		-o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS)
+ 
+ qmail/qmail-spamc: $(QMAIL_SPAMC_FILES)
+ 	$(CC) $(CFLAGS) $(QMAIL_SPAMC_FILES) \
diff --git a/mail/spamassassin/patches/patch-an b/mail/spamassassin/patches/patch-an
new file mode 100644
index 00000000000..27ccd10bbf7
--- /dev/null
+++ b/mail/spamassassin/patches/patch-an
@@ -0,0 +1,37 @@
+$NetBSD: patch-an,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- configure.in.orig	Fri Mar 28 22:25:56 2003
++++ configure.in
+@@ -1,4 +1,9 @@
+ AC_INIT
++AC_ARG_ENABLE(ssl,
++	AC_HELP_STRING([--enable-ssl],
++		[build spamc with ssl support (default is NO)]),
++	[with_ssl=${enableval:-no}],
++	[with_ssl=${enableval:-no}])
+ AC_CONFIG_SRCDIR([Makefile.PL])
+ AC_CONFIG_HEADER(config.h)
+ 
+@@ -41,8 +46,12 @@
+ dnl ----------------------------------------------------------------------
+ 
+ AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(crypto, CRYPTO_lock)
+-AC_CHECK_LIB(ssl, SSL_CTX_free,,,-lcrypto)
++if test $with_ssl = yes ; then
++	AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
++	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
++else
++	SSLLIBS=""
++fi
+ AC_CHECK_LIB(inet, connect)
+ AC_CHECK_LIB(nsl, t_accept)
+ AC_CHECK_LIB(dl, dlopen)
+@@ -125,6 +134,7 @@
+ # we cheat, since we *know* we have Perl installed ;)
+ CCDLFLAGS=`perl -e 'use Config; print $Config::Config{ccdlflags}'`
+ LDDLFLAGS=`perl -e 'use Config; print $Config::Config{lddlflags}'`
++AC_SUBST(SSLLIBS)
+ AC_SUBST(CCDLFLAGS)
+ AC_SUBST(LDDLFLAGS)
+ AC_SUBST(HAVE_SHUT_RD)
diff --git a/mail/spamassassin/patches/patch-ao b/mail/spamassassin/patches/patch-ao
new file mode 100644
index 00000000000..6c81aa956cf
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ao
@@ -0,0 +1,1428 @@
+$NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
+
+--- configure.orig	Fri Mar 28 22:25:56 2003
++++ configure
+@@ -1,19 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.53.
++# Generated by GNU Autoconf 2.54.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+@@ -22,11 +14,13 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
+-# NLS nuisances.
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -34,34 +28,39 @@
+   as_unset=false
+ fi
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++do
++  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+@@ -72,6 +71,7 @@
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+@@ -85,7 +85,7 @@
+   echo "#! /bin/sh" >conftest.sh
+   echo  "exit 0"   >>conftest.sh
+   chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+@@ -138,6 +138,8 @@
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+@@ -210,6 +212,12 @@
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+@@ -226,7 +234,7 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++$as_unset CDPATH
+ 
+ 
+ # Name of the host.
+@@ -240,6 +248,7 @@
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+@@ -296,6 +305,8 @@
+ # include <unistd.h>
+ #endif"
+ 
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SSLLIBS CCDLFLAGS LDDLFLAGS HAVE_SHUT_RD LIBOBJS LTLIBOBJS'
++ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -719,6 +730,9 @@
+    { (exit 1); exit 1; }; }
+   fi
+ fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+@@ -819,6 +833,11 @@
+ 
+   cat <<\_ACEOF
+ 
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-ssl            build spamc with ssl support (default is NO)
++
+ Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+@@ -867,7 +886,7 @@
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+@@ -907,7 +926,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.54.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -973,12 +992,9 @@
+   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+     ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+   esac
+-  case " $ac_configure_args " in
+-    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-       ac_sep=" " ;;
+-  esac
++  ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+   # Get rid of the leading space.
++  ac_sep=" "
+ done
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+@@ -990,6 +1006,7 @@
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
++
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+@@ -1012,6 +1029,35 @@
+     esac;
+ }
+     echo
++
++    cat <<\_ASBOX
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++## ------------- ##
++## Output files. ##
++## ------------- ##
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++        echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+@@ -1019,7 +1065,7 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h
++      sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+@@ -1177,7 +1223,15 @@
+ 
+ 
+ 
+-ac_config_headers="$ac_config_headers config.h"
++# Check whether --enable-ssl or --disable-ssl was given.
++if test "${enable_ssl+set}" = set; then
++  enableval="$enable_ssl"
++  with_ssl=${enableval:-no}
++else
++  with_ssl=${enableval:-no}
++fi;
++
++          ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+ if test -f Makefile.PL -a ! -f Makefile ; then
+@@ -1388,9 +1442,7 @@
+     # However, it has the same basename, so the bogon will be chosen
+     # first if we set CC to just the basename; use the full file name.
+     shift
+-    set dummy "$as_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+   fi
+ fi
+ fi
+@@ -1523,12 +1575,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1557,11 +1603,10 @@
+ # Be careful to initialize this variable, since it used to be cached.
+ # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ ac_cv_exeext=
+-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
+-                ls a.out conftest 2>/dev/null;
+-                ls a.* conftest.* 2>/dev/null`; do
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
++  test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+     a.out ) # We found the default executable, but exeext='' is most
+             # certainly right.
+             break;;
+@@ -1575,8 +1620,10 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
+-echo "$as_me: error: C compiler cannot create executables" >&2;}
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++check \`config.log' for details." >&5
++echo "$as_me: error: C compiler cannot create executables
++check \`config.log' for details." >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+@@ -1633,9 +1680,10 @@
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+ # `rm'.
+-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+           export ac_cv_exeext
+           break;;
+@@ -1664,12 +1712,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1686,7 +1728,7 @@
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -1714,12 +1756,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1768,12 +1804,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1819,6 +1849,97 @@
+     CFLAGS=
+   fi
+ fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
+ # Some people use a C++ compiler to compile C.  Since we use `exit',
+ # in C++ we need to declare it.  In case someone uses the same compiler
+ # for both compiling C and C++ we need to have the C++ compiler decide
+@@ -1854,12 +1975,6 @@
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1891,12 +2006,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_declaration
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -1981,7 +2090,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2014,7 +2123,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2072,7 +2181,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2105,7 +2214,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2148,6 +2257,21 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++
++
+ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+@@ -2165,7 +2289,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2196,7 +2320,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "memchr" >/dev/null 2>&1; then
++  $EGREP "memchr" >/dev/null 2>&1; then
+   :
+ else
+   ac_cv_header_stdc=no
+@@ -2214,7 +2338,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "free" >/dev/null 2>&1; then
++  $EGREP "free" >/dev/null 2>&1; then
+   :
+ else
+   ac_cv_header_stdc=no
+@@ -2273,7 +2397,7 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ fi
+@@ -2404,7 +2528,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2522,7 +2646,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2639,7 +2763,7 @@
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -2699,103 +2823,6 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+@@ -2805,12 +2832,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2904,12 +2925,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2962,12 +2977,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3023,7 +3032,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "uid_t" >/dev/null 2>&1; then
++  $EGREP "uid_t" >/dev/null 2>&1; then
+   ac_cv_type_uid_t=yes
+ else
+   ac_cv_type_uid_t=no
+@@ -3055,12 +3064,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3117,12 +3120,6 @@
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3181,12 +3178,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char socket ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3227,8 +3218,8 @@
+ 
+ fi
+ 
+-
+-echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
++if test $with_ssl = yes ; then
++	echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
+ echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3246,12 +3237,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char CRYPTO_lock ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3284,16 +3269,10 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
+ echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
+ if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCRYPTO 1
+-_ACEOF
+-
+-  LIBS="-lcrypto $LIBS"
+-
++  SSLLIBS="-lcrypto $SSLLIBS"
+ fi
+ 
+-
+-echo "$as_me:$LINENO: checking for SSL_CTX_free in -lssl" >&5
++	echo "$as_me:$LINENO: checking for SSL_CTX_free in -lssl" >&5
+ echo $ECHO_N "checking for SSL_CTX_free in -lssl... $ECHO_C" >&6
+ if test "${ac_cv_lib_ssl_SSL_CTX_free+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3311,12 +3290,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char SSL_CTX_free ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3349,14 +3322,12 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_free" >&5
+ echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_free" >&6
+ if test $ac_cv_lib_ssl_SSL_CTX_free = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSSL 1
+-_ACEOF
+-
+-  LIBS="-lssl $LIBS"
+-
++  SSLLIBS="-lssl $SSLLIBS"
+ fi
+ 
++else
++	SSLLIBS=""
++fi
+ 
+ echo "$as_me:$LINENO: checking for connect in -linet" >&5
+ echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6
+@@ -3376,12 +3347,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char connect ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3441,12 +3406,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char t_accept ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3506,12 +3465,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3582,12 +3535,6 @@
+ char $ac_func ();
+ char (*f) ();
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3646,12 +3593,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <netdb.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3701,12 +3642,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <getopt.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3757,12 +3692,6 @@
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <netinet/in.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3804,12 +3733,6 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3867,12 +3790,6 @@
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <netinet/in.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3925,12 +3842,6 @@
+ #include <sysexits.h>
+ #endif
+ #include <errno.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3978,7 +3889,8 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files binaries.mk"
++
++          ac_config_files="$ac_config_files binaries.mk"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -3990,7 +3902,7 @@
+ # config.status only pays attention to the cache file if you give it
+ # the --recheck option to rerun configure.
+ #
+-# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
+ # loading this file, other *unset* `ac_cv_foo' will be assigned the
+ # following values.
+ 
+@@ -4056,6 +3968,21 @@
+ 
+ DEFS=-DHAVE_CONFIG_H
+ 
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIBOBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+@@ -4074,7 +4001,6 @@
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+@@ -4083,11 +4009,13 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
+-# NLS nuisances.
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -4095,34 +4023,39 @@
+   as_unset=false
+ fi
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++do
++  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+@@ -4133,6 +4066,7 @@
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+@@ -4146,7 +4080,7 @@
+   echo "#! /bin/sh" >conftest.sh
+   echo  "exit 0"   >>conftest.sh
+   chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+@@ -4200,6 +4134,8 @@
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+@@ -4273,6 +4209,12 @@
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+@@ -4289,7 +4231,7 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++$as_unset CDPATH
+ 
+ exec 6>&1
+ 
+@@ -4306,7 +4248,7 @@
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.54.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -4365,7 +4307,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.53,
++configured by $0, generated by GNU Autoconf 2.54,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -4385,17 +4327,20 @@
+   --*=*)
+     ac_option=`expr "x$1" : 'x\([^=]*\)='`
+     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+-    shift
+-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+-    shift
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
+     ;;
+-  -*);;
+   *) # This is not an option, so the user has probably given explicit
+      # arguments.
++     ac_option=$1
+      ac_need_defaults=false;;
+   esac
+ 
+-  case $1 in
++  case $ac_option in
+   # Handling of the options.
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -4418,12 +4363,12 @@
+   --debug | --d* | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+-    shift
+-    CONFIG_FILES="$CONFIG_FILES $1"
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+-    shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+@@ -4541,9 +4486,13 @@
+ s,@EXEEXT@,$EXEEXT,;t t
+ s,@OBJEXT@,$OBJEXT,;t t
+ s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
++s,@SSLLIBS@,$SSLLIBS,;t t
+ s,@CCDLFLAGS@,$CCDLFLAGS,;t t
+ s,@LDDLFLAGS@,$LDDLFLAGS,;t t
+ s,@HAVE_SHUT_RD@,$HAVE_SHUT_RD,;t t
++s,@LIBOBJS@,$LIBOBJS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+ _ACEOF
+@@ -4614,25 +4563,30 @@
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+-  { case "$ac_dir" in
+-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+-  *)                      as_incr_dir=.;;
+-esac
+-as_dummy="$ac_dir"
+-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+-  case $as_mkdir_dir in
+-    # Skip DOS drivespec
+-    ?:) as_incr_dir=$as_mkdir_dir ;;
+-    *)
+-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+-      test -d "$as_incr_dir" ||
+-        mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
+-done; }
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$as_dir" : 'X\(//\)[^/]' \| \
++         X"$as_dir" : 'X\(//\)$' \| \
++         X"$as_dir" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+@@ -4662,7 +4616,7 @@
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+@@ -4847,7 +4801,7 @@
+ # Break up conftest.defines because some shells have a limit on the size
+ # of here documents, and old seds have small limits too (100 cmds).
+ echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+ echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+ echo '  :' >>$CONFIG_STATUS
+ rm -f conftest.tail
+@@ -4871,7 +4825,7 @@
+   mv conftest.tail conftest.defines
+ done
+ rm -f conftest.defines
+-echo '  fi # egrep' >>$CONFIG_STATUS
++echo '  fi # grep' >>$CONFIG_STATUS
+ echo >>$CONFIG_STATUS
+ 
+ # Break up conftest.undefs because some shells have a limit on the size
+@@ -4927,25 +4881,30 @@
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+-      { case "$ac_dir" in
+-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+-  *)                      as_incr_dir=.;;
+-esac
+-as_dummy="$ac_dir"
+-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+-  case $as_mkdir_dir in
+-    # Skip DOS drivespec
+-    ?:) as_incr_dir=$as_mkdir_dir ;;
+-    *)
+-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+-      test -d "$as_incr_dir" ||
+-        mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
+-done; }
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$as_dir" : 'X\(//\)[^/]' \| \
++         X"$as_dir" : 'X\(//\)$' \| \
++         X"$as_dir" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+       rm -f $ac_file
+       mv $tmp/config.h $ac_file