388 files changed, 270 insertions, 101902 deletions

diff --git a/mail/assp/files/510.assp.in b/mail/assp/files/510.assp.in
deleted file mode 100644
index f5964e4d38a4..000000000000
--- a/mail/assp/files/510.assp.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Update ASSP Spam and ClamAV databases
-
-cd %%ASSP_HOME%%
-
-[ -f nightly.log ] && mv nightly.log nightly.log.old
-
-if [ ! -f %%PREFIX%%/lib/assp/rebuildspamdb.pl ]
-then
-	echo "%%PREFIX%%/lib/assp/rebuildspamdb.pl does not exist"
-	rc_spamdb=2
-else
-	echo ""
-	echo "Running ASSP rebuildspamdb.pl (output to nightly.log)"
-	echo "Running ASSP rebuildspamdb.pl:" >>nightly.log
-	%%PERL%% %%PREFIX%%/lib/assp/rebuildspamdb.pl >>nightly.log && rc_spamdb=0 || rc_spamdb=3
-fi
-
-if [ ! -f %%PREFIX%%/lib/assp/freshclam.sh ]
-then
-	# existence of freshclam.sh is optional, dependent
-	# on the WITH_CLAMAV setting, so not an error if not there
-	rc_clamav=0
-else
-	echo ""
-	echo "Fetching ASSP ClamAV virus database updates:"
-	export PATH=$PATH:%%LOCALBASE%%/bin
-	sh %%PREFIX%%/lib/assp/freshclam.sh && rc_clamav=0 || rc_clamav=3
-fi
-
-. %%RC_SUBR%%
-name=assp
-rcvar=`set_rcvar`
-load_rc_config $name
-: ${assp_logexpire="45"}
-
-echo ""
-echo "Removing old ASSP log files:"
-find . -name '*.maillog.txt' -mtime +$assp_logexpire -exec ls -l {} \; -exec rm {} \;
-
-exit $(($rc_spamdb|$rc_clamav))
diff --git a/mail/c-sig-emacs21/Makefile b/mail/c-sig-emacs21/Makefile
deleted file mode 100644
index 637302cecd0e..000000000000
--- a/mail/c-sig-emacs21/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	c-sig
-# Date created:				30 May 2004
-# Whom:					KIMURA Yasuhiro <yasu@utahime.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	c-sig
-PORTVERSION=	3.8
-CATEGORIES=	mail elisp
-MASTER_SITES=	http://www.threeweb.ad.jp/~kshibata/c-sig/programs/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-
-MAINTAINER=	yasu@utahime.org
-COMMENT=	Signature insertion tool for Emacs
-
-USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-
-EMACS_NO_BUILD_DEPENDS=	yes
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-
-do-install:
-	${MKDIR} ${LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/c-sig.el ${LISPDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for file in c-sig-eng.faq c-sig-eng.man c-sig-jp.faq c-sig-jp.man
-	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/c-sig-emacs21/distinfo b/mail/c-sig-emacs21/distinfo
deleted file mode 100644
index 18be4549ba54..000000000000
--- a/mail/c-sig-emacs21/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (c-sig.3.8.tar.gz) = d3db4543cf5c9827dbc5bebcedb1f693
-SHA256 (c-sig.3.8.tar.gz) = cb035108a6b1006a2c3bcf7e6b9d759c826d54966b345728e24fb73dd88db3fa
-SIZE (c-sig.3.8.tar.gz) = 21827
diff --git a/mail/c-sig-emacs21/pkg-descr b/mail/c-sig-emacs21/pkg-descr
deleted file mode 100644
index 07354c258886..000000000000
--- a/mail/c-sig-emacs21/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-C-sig is signature insertion tool for Emacs. It provides the following
-features:
-
-- Easy to create signatures.
-- Three insertion functions.
-- Powerful retrieval and learning function.
-- c-sig can convert text automatically when insertion.
-- signatures can be modified by emacs lisp.
-
-WWW: http://www.osk.3web.ne.jp/~kshibata/c-sig/english/
diff --git a/mail/c-sig-emacs21/pkg-plist b/mail/c-sig-emacs21/pkg-plist
deleted file mode 100644
index 0b3527f77714..000000000000
--- a/mail/c-sig-emacs21/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/c-sig.el
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.faq
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.man
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.faq
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
deleted file mode 100644
index 5b5d2b065ae0..000000000000
--- a/mail/claws-mail-rssyl/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	rssyl
-# Date created:				17 December 2005
-# Whom:					v.velox@vvelox.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rssyl
-PORTVERSION=	0.3
-CATEGORIES=	mail
-MASTER_SITES=	http://ticho.yweb.sk/rssyl/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
-
-MAINTAINER=	v.velox@vvelox.net
-COMMENT=	A RSS/Atom plugin for sylheed-claws
-
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	sylpheed-claws:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws:${PORTSDIR}/mail/sylpheed-claws
-
-USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	autoconf:259
-USE_REINPLACE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/100\.93/100/' ${WRKSRC}/configure.ac
-
-.include <bsd.port.mk>
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
deleted file mode 100644
index cb7e6b040fbb..000000000000
--- a/mail/claws-mail-rssyl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (rssyl-0.3.tar.gz) = 53866c464c35737d0ba684c85491014c
-SHA256 (rssyl-0.3.tar.gz) = 225f78b9f611a269c9a50ecc7405c9ef8a8d57c27166b80f5afdd37f561d359f
-SIZE (rssyl-0.3.tar.gz) = 390916
diff --git a/mail/claws-mail-rssyl/pkg-descr b/mail/claws-mail-rssyl/pkg-descr
deleted file mode 100644
index be7f838efff1..000000000000
--- a/mail/claws-mail-rssyl/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This plugin allows you to read your favorite newsfeeds in Claws.
-RSS 1.0, 2.0 and Atom feeds are currently supported.
-
-WWW: http://ticho.yweb.sk/rssyl/
diff --git a/mail/claws-mail-rssyl/pkg-plist b/mail/claws-mail-rssyl/pkg-plist
deleted file mode 100644
index 2087f9e78825..000000000000
--- a/mail/claws-mail-rssyl/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/sylpheed-claws/plugins/rssyl.a
-lib/sylpheed-claws/plugins/rssyl.la
-lib/sylpheed-claws/plugins/rssyl.so
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
deleted file mode 100644
index 7b6e5d91a7b5..000000000000
--- a/mail/claws-mail/Makefile
+++ /dev/null
@@ -1,219 +0,0 @@
-# New ports collection makefile for:	sylpheed-claws
-# Date created:		3 January 2002
-# Whom:			Simon 'corecode' Schubert <corecode@corecode.ath.cx>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sylpheed-claws
-PORTVERSION=	2.0.0
-PORTREVISION=	1
-CATEGORIES=	mail news ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sylpheed-claws
-DISTFILES=	${EXTRACT_ONLY} \
-		${THEMEFILE}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	netchild@FreeBSD.org
-COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
-
-LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-
-THEMEVERSION=	20040929
-THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack pkgconfig gtk20
-USE_REINPLACE=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
-USE_GCC=	3.3+
-WANT_GNOME=	yes
-
-MAN1=		sylpheed-claws.1
-
-CONFIGURE_ARGS=	--enable-ipv6 \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-manualdir=${DOCSDIR}/manual \
-		--with-faqdir=${DOCSDIR}/faq
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-OPTIONS=	ALL		"Enable all options."			off \
-		ASPELL		"Enable spell checking support."	on \
-		CLAMAV		"Enable virus-checking support."	off \
-		COMPFACE	"Enable X-Face support."		on \
-		GNOMEPRINT	"Enable extended print support (GNOME)."	off \
-		GPGME		"Enable PGP/GnuPG support using GPGME."	off \
-		JPILOT		"Enable JPilot support."		off \
-		LDAP		"Enable LDAP support."			off \
-		SA_PLUG		"Enable SpamAssassin support."		off \
-		SSL		"Enable OpenSSL support."		on \
-		THEMES		"Install additional themes."		on
-		
-
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=		${FILESDIR}/extra-doc:Makefile.in
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=	--enable-openssl --with-openssl-includes=${OPENSSLINC} \
-			--with-openssl-libs=${OPENSSLLIB}
-CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
-			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
-.else
-CONFIGURE_ARGS+=	--disable-openssl
-.endif
-
-.if ${HAVE_GNOME:Mgnomehier} != "" || defined(WITH_GNOMEPRINT)
-USE_GNOME+=	gnomehier
-PLIST_SUB+=	GNOME=""
-USE_GNOME+=	gnomehier
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
-.if ${HAVE_GNOME:Mgnomeprint} != "" || defined(WITH_GNOMEPRINT)
-PLIST_SUB+=     	GNOMEPRINT=""
-USE_GNOME+=		libgnomeprint libgnomeprintui
-CONFIGURE_ARGS+=	--enable-gnomeprint
-.else
-PLIST_SUB+=     	GNOMEPRINT="@comment "
-CONFIGURE_ARGS+=	--disable-gnomeprint
-.endif
-
-
-.if exists(${LOCALBASE}/include/clamav.h)
-WITH_CLAMAV=		yes
-.endif
-
-.if defined(WITH_CLAMAV) || defined(WITH_ALL)
-CONFIGURE_ARGS+=	--enable-clamav-plugin
-PLIST_SUB+=		CLAM_PLUG=""
-BUILD_DEPENDS=	   	${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
-.else
-CONFIGURE_ARGS+=	--disable-clamav-plugin
-PLIST_SUB+=		CLAM_PLUG="@comment "
-.endif
-.if defined(WITH_COMPFACE) || defined(WITH_ALL)
-LIB_DEPENDS+=		compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=	--enable-compface
-.else
-CONFIGURE_ARGS+=	--disable-compface
-.endif
-.if defined(WITH_ASPELL) || defined(WITH_ALL)
-LIB_DEPENDS+=		pspell.16:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--enable-aspell
-.else
-CONFIGURE_ARGS+=	--disable-aspell
-.endif
-.if defined(WITH_JPILOT) || defined(WITH_ALL)
-LIB_DEPENDS+=		pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=	--enable-jpilot
-.else
-CONFIGURE_ARGS+=	--disable-jpilot
-.endif
-.if defined(WITH_LDAP) || defined(WITH_ALL)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--enable-ldap
-.else
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
-.if defined(WITH_SA_PLUG) || defined(WITH_ALL)
-RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-CONFIGURE_ARGS+=	--enable-spamassassin-plugin
-PLIST_SUB+=		SA_PLUG=""
-.else
-CONFIGURE_ARGS+=	--disable-spamassassin-plugin
-PLIST_SUB+=		SA_PLUG="@comment "
-.endif
-.if defined(WITH_GPGME) || defined(WITH_ALL)
-PLIST_SUB+=		GPGME=""
-CONFIGURE_ARGS+=	--enable-pgpmime-plugin --enable-pgpcore-plugin \
-			--enable-pgpinline-plugin
-LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-.else
-PLIST_SUB+=		GPGME="@comment "
-CONFIGURE_ARGS+=	--disable-pgpmime-plugin --disable-pgpcore-plugin \
-			--disable-pgpinline-plugin
-.endif
-.if defined(WITHOUT_THEMES)
-PLIST_SUB+=	THEMES="@comment "
-.else
-PLIST_SUB+=	THEMES=""
-.endif
-
-post-extract:
-.if !defined(WITHOUT_THEMES)
-	@${MKDIR} ${WRKSRC}/themes
-	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${THEMEFILE} ${EXTRACT_AFTER_ARGS}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lresolv||g; s|-lpisock\"|-liconv &|g ;\
-		s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
-	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \
-		${WRKSRC}/src/procmime.c
-	@${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@SYLPHEED_GNOME:#@SYLPHEED_GNOME:g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s:-Wno-unused-function::" ${WRKSRC}/src/Makefile.in
-	@for f in `${FIND} ${WRKSRC}/tools -type f -print`; do \
-		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
-#	@${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-.for i in NEWS README RELEASE_NOTES TODO tools/README.sylprint
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
-.endif
-	@${MKDIR} ${DATADIR}
-	@cd ${WRKSRC}/tools && \
-		${INSTALL_SCRIPT} OOo2sylpheed.pl acroread2sylpheed.pl \
-		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
-		freshmeat_search.pl gif2xface.pl google_msgid.pl \
-		google_search.pl kmail2sylpheed.pl \
-		kmail2sylpheed_v2.pl maildir2sylpheed.pl multiwebsearch.conf \
-		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
-		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
-		${DATADIR}
-
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	@${MKDIR} ${PREFIX}/share/gnome/applications
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/gnome/applications/
-.endif
-
-.if !defined(WITHOUT_THEMES)
-	@${MKDIR} ${DATADIR}/themes
-	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
-		${GREP} -vE '(xvpics|.directory)' | \
-		${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes/
-	@${CHMOD} -R a+r ${DATADIR}/themes
-	@${FIND} ${DATADIR}/themes -type d -print0 | ${XARGS} -0 ${CHMOD} a+x
-.endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
-	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws*.png ${PREFIX}/share/pixmaps/
-
-.include <bsd.port.post.mk>
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
deleted file mode 100644
index d8b4db3ca766..000000000000
--- a/mail/claws-mail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (sylpheed-claws-2.0.0.tar.bz2) = 6e26f8e36772b71361d0c463b9a6c7a1
-SHA256 (sylpheed-claws-2.0.0.tar.bz2) = 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d
-SIZE (sylpheed-claws-2.0.0.tar.bz2) = 3764105
-MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
-SHA256 (sylpheed-iconset-20040929.tar.gz) = 11e791cf7187b5f3ac5a5ab5f0144d9ea8701bbc6182b30b35c30c2cc50e5210
-SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/files/extra-doc:Makefile.in b/mail/claws-mail/files/extra-doc:Makefile.in
deleted file mode 100644
index 7cb0b03d88ed..000000000000
--- a/mail/claws-mail/files/extra-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon May 10 10:06:47 2004
-+++ doc/Makefile.in	Mon May 10 10:07:06 2004
-@@ -257,7 +257,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = faq man manual
-+SUBDIRS = man
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/mail/claws-mail/files/patch-configure.ac b/mail/claws-mail/files/patch-configure.ac
deleted file mode 100644
index 8bc413ea4cd3..000000000000
--- a/mail/claws-mail/files/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	Sat Jul 30 10:54:42 2005
-+++ configure.ac	Sat Jul 30 11:10:47 2005
-@@ -303,7 +303,18 @@
- AC_MSG_CHECKING([whether to use OpenSSL])
- if test x"$ac_cv_enable_openssl" = xyes; then
- 	AC_MSG_RESULT(yes)
--	PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
-+	case $host_os in
-+		*freebsd*)
-+			if test $(openssl version | cut -d ' ' -f 2) \< 0.9.7 ; then
-+				ac_cv_enable_openssl=no
-+			else
-+				OPENSSL_LIBS=${OPENSSL_LIBS-"-lcrypto -lssl"}
-+			fi
-+			;;
-+		*)
-+			PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
-+			;;
-+	esac
- 	if test x$ac_cv_enable_openssl = xyes; then
- 		AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
- 	else
diff --git a/mail/claws-mail/files/patch-doc-man-Makefile.in b/mail/claws-mail/files/patch-doc-man-Makefile.in
deleted file mode 100644
index 40953fde2124..000000000000
--- a/mail/claws-mail/files/patch-doc-man-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/man/Makefile.in.orig	Sat Nov  5 12:14:20 2005
-+++ doc/man/Makefile.in	Sat Nov  5 12:15:52 2005
-@@ -329,6 +329,7 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  inst=`echo $$inst | sed -e 's:sylpheed\.1:sylpheed-claws.1:'`; \
- 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
- 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
diff --git a/mail/claws-mail/files/patch-tools-README.sylprint b/mail/claws-mail/files/patch-tools-README.sylprint
deleted file mode 100644
index 1085b058553b..000000000000
--- a/mail/claws-mail/files/patch-tools-README.sylprint
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/README.sylprint.orig	Sat Nov  5 11:35:01 2005
-+++ tools/README.sylprint	Sat Nov  5 11:36:54 2005
-@@ -144,11 +144,12 @@
- 	sylprint.pl
- 		The script itself.
- 
--	sylprint.rc
-+	%%PREFIX%%/etc/sylprint.rc
-+	~/.sylpheed/sylprint.rc
- 		Stores user default preferred configuration for the
- 		script. Settings in this file may be overriden by
--		command line options. Must be stored in the same
--		directory of the script and/or in the ~/.sylpheed-claws
-+		command line options. Must be stored in the local
-+		configuration directory and/or in the ~/.sylpheed-claws
- 		one (Sylpheed user's configuration directory).
- 	
- 	/tmp/sylprint.username.number
diff --git a/mail/claws-mail/files/patch-tools-sylprint.pl b/mail/claws-mail/files/patch-tools-sylprint.pl
deleted file mode 100644
index fce5e4ec5bbe..000000000000
--- a/mail/claws-mail/files/patch-tools-sylprint.pl
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/sylprint.pl.orig	Tue Jan  8 20:34:37 2002
-+++ tools/sylprint.pl	Tue Jan 15 00:13:15 2002
-@@ -36,10 +36,7 @@
- # get user config
- if (defined($ARGV[1]) && $ARGV[1] eq '-r') { $a++; }
- else {
--	@spp = split('/',$0); 
--	$spp[$#spp] = ''; 
--	$spp = join('/',@spp);  
--	$rcf="$spp$rc"; 
-+	$rcf="%%PREFIX%%/etc/$rc"; 
- 	if (-x $rcf) { do $rcf; }
- 	$rcf="$ENV{'HOME'}/.sylpheed/$rc";
- 	if (-x $rcf) { do $rcf; }
diff --git a/mail/claws-mail/pkg-descr b/mail/claws-mail/pkg-descr
deleted file mode 100644
index 67b9da13253f..000000000000
--- a/mail/claws-mail/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-In addition to the above, Sylpheed-claws has a lot of extra features,
-e.g. a plugin mechanism, a new filtering/processing mechanism,
-extra folder properties and much more...
-
-WWW: http://sylpheed-claws.sourceforge.net/
-
-- Simon 'corecode' Schubert
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
deleted file mode 100644
index cc0b2002fcaf..000000000000
--- a/mail/claws-mail/pkg-plist
+++ /dev/null
@@ -1,2049 +0,0 @@
-bin/sylpheed-claws
-bin/sylprint.pl
-etc/sylprint.rc.example
-include/sylpheed-claws/account.h
-include/sylpheed-claws/action.h
-include/sylpheed-claws/adbookbase.h
-include/sylpheed-claws/addr_compl.h
-include/sylpheed-claws/addrbook.h
-include/sylpheed-claws/addrcache.h
-include/sylpheed-claws/addrclip.h
-include/sylpheed-claws/addrdefs.h
-include/sylpheed-claws/addressadd.h
-include/sylpheed-claws/addressbook.h
-include/sylpheed-claws/addressitem.h
-include/sylpheed-claws/addrgather.h
-include/sylpheed-claws/addrharvest.h
-include/sylpheed-claws/addrindex.h
-include/sylpheed-claws/addritem.h
-include/sylpheed-claws/addrquery.h
-include/sylpheed-claws/addrselect.h
-include/sylpheed-claws/alertpanel.h
-include/sylpheed-claws/browseldap.h
-include/sylpheed-claws/codeconv.h
-include/sylpheed-claws/common/base64.h
-include/sylpheed-claws/common/defs.h
-include/sylpheed-claws/common/hooks.h
-include/sylpheed-claws/common/log.h
-include/sylpheed-claws/common/md5.h
-include/sylpheed-claws/common/mgutils.h
-include/sylpheed-claws/common/nntp.h
-include/sylpheed-claws/common/passcrypt.h
-include/sylpheed-claws/common/plugin.h
-include/sylpheed-claws/common/prefs.h
-include/sylpheed-claws/common/progressindicator.h
-include/sylpheed-claws/common/quoted-printable.h
-include/sylpheed-claws/common/session.h
-include/sylpheed-claws/common/smtp.h
-include/sylpheed-claws/common/socket.h
-include/sylpheed-claws/common/ssl.h
-include/sylpheed-claws/common/ssl_certificate.h
-include/sylpheed-claws/common/string_match.h
-include/sylpheed-claws/common/stringtable.h
-include/sylpheed-claws/common/sylpheed.h
-include/sylpheed-claws/common/template.h
-include/sylpheed-claws/common/timing.h
-include/sylpheed-claws/common/utils.h
-include/sylpheed-claws/common/uuencode.h
-include/sylpheed-claws/common/version.h
-include/sylpheed-claws/common/xml.h
-include/sylpheed-claws/common/xmlprops.h
-include/sylpheed-claws/compose.h
-include/sylpheed-claws/config.h
-include/sylpheed-claws/crash.h
-include/sylpheed-claws/customheader.h
-include/sylpheed-claws/displayheader.h
-include/sylpheed-claws/editaddress.h
-include/sylpheed-claws/editbook.h
-include/sylpheed-claws/editgroup.h
-include/sylpheed-claws/editjpilot.h
-include/sylpheed-claws/editldap.h
-include/sylpheed-claws/editldap_basedn.h
-include/sylpheed-claws/editvcard.h
-include/sylpheed-claws/enriched.h
-include/sylpheed-claws/etpan/etpan-thread-manager-types.h
-include/sylpheed-claws/etpan/etpan-thread-manager.h
-include/sylpheed-claws/etpan/etpan-errors.h
-include/sylpheed-claws/etpan/etpan-log.h
-include/sylpheed-claws/etpan/imap-thread.h
-include/sylpheed-claws/exphtmldlg.h
-include/sylpheed-claws/expldifdlg.h
-include/sylpheed-claws/export.h
-include/sylpheed-claws/exporthtml.h
-include/sylpheed-claws/exportldif.h
-include/sylpheed-claws/filtering.h
-include/sylpheed-claws/folder.h
-include/sylpheed-claws/folder_item_prefs.h
-include/sylpheed-claws/foldersel.h
-include/sylpheed-claws/folderutils.h
-include/sylpheed-claws/folderview.h
-include/sylpheed-claws/gedit-print.h
-include/sylpheed-claws/grouplistdialog.h
-include/sylpheed-claws/gtk/about.h
-include/sylpheed-claws/gtk/colorlabel.h
-include/sylpheed-claws/gtk/colorsel.h
-include/sylpheed-claws/gtk/description_window.h
-include/sylpheed-claws/gtk/filesel.h
-include/sylpheed-claws/gtk/foldersort.h
-include/sylpheed-claws/gtk/gtkaspell.h
-include/sylpheed-claws/gtk/gtksctree.h
-include/sylpheed-claws/gtk/gtkshruler.h
-include/sylpheed-claws/gtk/gtksourceprintjob.h
-include/sylpheed-claws/gtk/gtkutils.h
-include/sylpheed-claws/gtk/gtkvscrollbutton.h
-include/sylpheed-claws/gtk/icon_legend.h
-include/sylpheed-claws/gtk/inputdialog.h
-include/sylpheed-claws/gtk/logwindow.h
-include/sylpheed-claws/gtk/manage_window.h
-include/sylpheed-claws/gtk/menu.h
-include/sylpheed-claws/gtk/pluginwindow.h
-include/sylpheed-claws/gtk/prefswindow.h
-include/sylpheed-claws/gtk/progressdialog.h
-include/sylpheed-claws/gtk/quicksearch.h
-include/sylpheed-claws/gtk/sslcertwindow.h
-include/sylpheed-claws/gtk/sylpheed-marshal.h
-include/sylpheed-claws/headerview.h
-include/sylpheed-claws/html.h
-include/sylpheed-claws/image_viewer.h
-include/sylpheed-claws/imap.h
-include/sylpheed-claws/imap_gtk.h
-include/sylpheed-claws/import.h
-include/sylpheed-claws/importldif.h
-include/sylpheed-claws/importmutt.h
-include/sylpheed-claws/importpine.h
-include/sylpheed-claws/inc.h
-include/sylpheed-claws/jpilot.h
-include/sylpheed-claws/ldapctrl.h
-include/sylpheed-claws/ldaplocate.h
-include/sylpheed-claws/ldapquery.h
-include/sylpheed-claws/ldapserver.h
-include/sylpheed-claws/ldaputil.h
-include/sylpheed-claws/ldif.h
-include/sylpheed-claws/localfolder.h
-include/sylpheed-claws/main.h
-include/sylpheed-claws/mainwindow.h
-include/sylpheed-claws/manual.h
-include/sylpheed-claws/matcher.h
-include/sylpheed-claws/matcher_parser.h
-include/sylpheed-claws/matcher_parser_lex.h
-include/sylpheed-claws/matcher_parser_parse.h
-include/sylpheed-claws/mbox.h
-include/sylpheed-claws/message_search.h
-include/sylpheed-claws/messageview.h
-include/sylpheed-claws/mh.h
-include/sylpheed-claws/mh_gtk.h
-include/sylpheed-claws/mimeview.h
-include/sylpheed-claws/msgcache.h
-include/sylpheed-claws/mutt.h
-include/sylpheed-claws/news.h
-include/sylpheed-claws/news_gtk.h
-include/sylpheed-claws/noticeview.h
-include/sylpheed-claws/partial_download.h
-include/sylpheed-claws/pine.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/passphrase.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/prefs_gpg.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/select-keys.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/sgpgme.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpinline/pgpinline.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpmime/pgpmime.h
-include/sylpheed-claws/pop.h
-include/sylpheed-claws/prefs_account.h
-include/sylpheed-claws/prefs_actions.h
-include/sylpheed-claws/prefs_common.h
-include/sylpheed-claws/prefs_compose_writing.h
-include/sylpheed-claws/prefs_customheader.h
-include/sylpheed-claws/prefs_display_header.h
-include/sylpheed-claws/prefs_ext_prog.h
-include/sylpheed-claws/prefs_filtering.h
-include/sylpheed-claws/prefs_filtering_action.h
-include/sylpheed-claws/prefs_folder_column.h
-include/sylpheed-claws/prefs_folder_item.h
-include/sylpheed-claws/prefs_fonts.h
-include/sylpheed-claws/prefs_gtk.h
-include/sylpheed-claws/prefs_image_viewer.h
-include/sylpheed-claws/prefs_matcher.h
-include/sylpheed-claws/prefs_message.h
-include/sylpheed-claws/prefs_msg_colors.h
-include/sylpheed-claws/prefs_other.h
-include/sylpheed-claws/prefs_quote.h
-include/sylpheed-claws/prefs_receive.h
-include/sylpheed-claws/prefs_send.h
-include/sylpheed-claws/prefs_spelling.h
-include/sylpheed-claws/prefs_summaries.h
-include/sylpheed-claws/prefs_summary_column.h
-include/sylpheed-claws/prefs_template.h
-include/sylpheed-claws/prefs_themes.h
-include/sylpheed-claws/prefs_toolbar.h
-include/sylpheed-claws/prefs_wrapping.h
-include/sylpheed-claws/privacy.h
-include/sylpheed-claws/procheader.h
-include/sylpheed-claws/procmime.h
-include/sylpheed-claws/procmsg.h
-include/sylpheed-claws/quote_fmt.h
-include/sylpheed-claws/quote_fmt_lex.h
-include/sylpheed-claws/quote_fmt_parse.h
-include/sylpheed-claws/recv.h
-include/sylpheed-claws/remotefolder.h
-include/sylpheed-claws/send_message.h
-include/sylpheed-claws/setup.h
-include/sylpheed-claws/sourcewindow.h
-include/sylpheed-claws/ssl_manager.h
-include/sylpheed-claws/statusbar.h
-include/sylpheed-claws/stock_pixmap.h
-include/sylpheed-claws/summary_search.h
-include/sylpheed-claws/summaryview.h
-include/sylpheed-claws/textview.h
-include/sylpheed-claws/toolbar.h
-include/sylpheed-claws/undo.h
-include/sylpheed-claws/unmime.h
-include/sylpheed-claws/vcard.h
-include/sylpheed-claws/wizard.h
-lib/sylpheed-claws/plugins/dillo_viewer.a
-lib/sylpheed-claws/plugins/dillo_viewer.la
-lib/sylpheed-claws/plugins/dillo_viewer.so
-lib/sylpheed-claws/plugins/trayicon.a
-lib/sylpheed-claws/plugins/trayicon.la
-lib/sylpheed-claws/plugins/trayicon.so
-libdata/pkgconfig/sylpheed-claws.pc
-@dirrm include/sylpheed-claws/common
-@dirrm include/sylpheed-claws/etpan
-@dirrm include/sylpheed-claws/gtk
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
-@dirrmtry include/sylpheed-claws/plugins
-@dirrmtry include/sylpheed-claws
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.sylprint
-%%PORTDOCS%%%%DOCSDIR%%/README.tools
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ca/LC_MESSAGES/sylpheed-claws.mo
-share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
-share/locale/de/LC_MESSAGES/sylpheed-claws.mo
-share/locale/el/LC_MESSAGES/sylpheed-claws.mo
-share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
-share/locale/es/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fi/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hu/LC_MESSAGES/sylpheed-claws.mo
-share/locale/it/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nb/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ru/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sk/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
-share/pixmaps/sylpheed-claws-128x128.png
-share/pixmaps/sylpheed-claws-64x64.png
-share/pixmaps/sylpheed-claws.png
-%%GNOME%%share/gnome/applications/sylpheed-claws.desktop
-%%DATADIR%%/OOo2sylpheed.pl
-%%DATADIR%%/acroread2sylpheed.pl
-%%DATADIR%%/calypso_convert.pl
-%%DATADIR%%/convert_mbox.pl
-%%DATADIR%%/eud2gc.py
-%%DATADIR%%/filter_conv.pl
-%%DATADIR%%/freshmeat_search.pl
-%%DATADIR%%/gif2xface.pl
-%%DATADIR%%/google_msgid.pl
-%%DATADIR%%/google_search.pl
-%%DATADIR%%/kmail2sylpheed.pl
-%%DATADIR%%/kmail2sylpheed_v2.pl
-%%DATADIR%%/maildir2sylpheed.pl
-%%DATADIR%%/multiwebsearch.conf
-%%DATADIR%%/multiwebsearch.pl
-%%DATADIR%%/nautilus2sylpheed.sh
-%%DATADIR%%/outlook2sylpheed.pl
-%%DATADIR%%/tb2sylpheed
-%%DATADIR%%/textviewer.sh
-%%DATADIR%%/update-po
-%%DATADIR%%/uudec
-%%DATADIR%%/vcard2xml.py
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.txt
-%%THEMES%%%%DATADIR%%/themes/Crystal/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Crystal/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/dir-close.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/dir-open.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/search.xpm
-%%THEMES%%%%DATADIR%%/themes/Crystal/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/ReadMe
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/linewrap_current.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/online.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/README
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/address_search.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/check_spelling.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/copy.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/cut.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/linewrapcurrent.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/online.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_encrypted.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/sylpheed_logo.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Gnomeria/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/ChangeLog
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/README
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/address_search.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec1.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec2.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/folder.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/ignore_thread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/linewrapcurrent.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail1.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_list.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_application_octet_stream.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/online.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/print.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/print1.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_enabled.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/regular.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/search.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Gorillaws/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/README
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address_search.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/folder.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/regular.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/search.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/sylpheed_logo.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/GurUnix/ChangeLog
-%%THEMES%%%%DATADIR%%/themes/GurUnix/INSTALL
-%%THEMES%%%%DATADIR%%/themes/GurUnix/README.txt
-%%THEMES%%%%DATADIR%%/themes/GurUnix/address.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/book.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/category.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/error.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/group.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/ignore_thread.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/key.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_list.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/new.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/pgp_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/print.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/queue.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/search.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/GurUnix/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Korillaws/ChangeLog
-%%THEMES%%%%DATADIR%%/themes/Korillaws/README
-%%THEMES%%%%DATADIR%%/themes/Korillaws/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/address_search.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/exec1.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/exec2.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/folder.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/ignore_thread.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/linewrapcurrent.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail1.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_list.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_application_octet_stream.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/online.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/print.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/print1.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_enabled.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/regular.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/search.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Korillaws/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/New_Session/Readme.txt
-%%THEMES%%%%DATADIR%%/themes/New_Session/address.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/new.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/New_Session/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Phoenity/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/category.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/delete.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/group.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/readme.txt
-%%THEMES%%%%DATADIR%%/themes/Phoenity/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/search.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Phoenity/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/README
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/README
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/address.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/book.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/error.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/key.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/ChangeLog
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/ChangeLog.pre-1-4
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/all_contacts.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/dayview.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/flag-for-followup.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail-replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/new.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/online.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/Sylpholution/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/SylZilla/ChangeLog
-%%THEMES%%%%DATADIR%%/themes/SylZilla/README
-%%THEMES%%%%DATADIR%%/themes/SylZilla/address.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/address_search.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/book.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/category.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/error.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/folder.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/group.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/ignore_thread.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/key.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/ldap.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_list.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_application_octet_stream.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/new.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_error.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_note.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/print.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/properties.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/regular.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/search.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/SylZilla/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/XeNtish/README
-%%THEMES%%%%DATADIR%%/themes/XeNtish/address.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/new.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/XeNtish/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/address.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/book.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/delete.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/error.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/key.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_extern.xcf
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/new.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/offline.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/online.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/achileus-noname/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/black/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/black/README
-%%THEMES%%%%DATADIR%%/themes/black/address.xpm
-%%THEMES%%%%DATADIR%%/themes/black/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/black/book.xpm
-%%THEMES%%%%DATADIR%%/themes/black/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/black/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/black/close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/black/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/black/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/black/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/black/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/black/error.xpm
-%%THEMES%%%%DATADIR%%/themes/black/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/black/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/black/group.xpm
-%%THEMES%%%%DATADIR%%/themes/black/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/black/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/black/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/black/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/black/key.xpm
-%%THEMES%%%%DATADIR%%/themes/black/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/black/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/black/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/black/new.xpm
-%%THEMES%%%%DATADIR%%/themes/black/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/black/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/black/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/black/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/black/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/black/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/black/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/black/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/black/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/black/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/black/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/Readme.txt
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/address.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir-close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir-open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/new.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/blue_anarchy/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/mongrel/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/mongrel2/INSTALL
-%%THEMES%%%%DATADIR%%/themes/mongrel2/address.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/book.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/delete.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/error.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/key.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/new.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/mongrel2/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/mozilla/README
-%%THEMES%%%%DATADIR%%/themes/mozilla/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/close.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/mozilla/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/README
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/address.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/book.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/checkbox_off.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/checkbox_on.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/delete.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/error.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/key.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/messageview_text.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_expired.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_failed.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_passed.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/new.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/notice_warn.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/orbit-claws/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/stw/address.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/book.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/error.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/folder.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/key.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/new.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/stw/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/tml02c/address.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/book.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/category.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/clip.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/clipkey.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/continue.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/deleted.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/error.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/jpilot.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/key.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/locked.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/new.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/tml02c/work_online.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/.sylpheed_themeinfo
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/README
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/address_book.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/book.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/complete.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/down_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/draft_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/draft_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/drafts_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/drafts_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/edit_extern.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/exec.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/forwarded.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/gpg_signed.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/ignorethread.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/insert_file.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/interface.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/linewrap.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_forward.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_receive.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_receive_all.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply_to_all.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply_to_author.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_send.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_send_queue.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_sign.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mark.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_application.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_attach.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_audio.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_image.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_message.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_enriched.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_html.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_plain.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_unknown.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/new.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/news_compose.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/paste.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/preferences.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/quicksearch.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/replied.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_close.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_close_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_open.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_open_hrm.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/unread.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/up.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/up_arrow.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/vcard.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/work_offline.xpm
-%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/work_online.xpm
-%%THEMES%%@dirrm %%DATADIR%%/themes/Crystal
-%%THEMES%%@dirrm %%DATADIR%%/themes/Everaldo_Kids
-%%THEMES%%@dirrm %%DATADIR%%/themes/Gnomeria
-%%THEMES%%@dirrm %%DATADIR%%/themes/Gorillaws
-%%THEMES%%@dirrm %%DATADIR%%/themes/Graphitte-0.9.7
-%%THEMES%%@dirrm %%DATADIR%%/themes/GurUnix
-%%THEMES%%@dirrm %%DATADIR%%/themes/Korillaws
-%%THEMES%%@dirrm %%DATADIR%%/themes/Kovico-sylpheed
-%%THEMES%%@dirrm %%DATADIR%%/themes/New_Session
-%%THEMES%%@dirrm %%DATADIR%%/themes/Phoenity
-%%THEMES%%@dirrm %%DATADIR%%/themes/Plain_and_Bluish
-%%THEMES%%@dirrm %%DATADIR%%/themes/Skypilot Clawssic
-%%THEMES%%@dirrm %%DATADIR%%/themes/SylZilla
-%%THEMES%%@dirrm %%DATADIR%%/themes/Sylpholution
-%%THEMES%%@dirrm %%DATADIR%%/themes/XeNtish
-%%THEMES%%@dirrm %%DATADIR%%/themes/achileus-noname
-%%THEMES%%@dirrm %%DATADIR%%/themes/black
-%%THEMES%%@dirrm %%DATADIR%%/themes/blue_anarchy
-%%THEMES%%@dirrm %%DATADIR%%/themes/mongrel
-%%THEMES%%@dirrm %%DATADIR%%/themes/mongrel2
-%%THEMES%%@dirrm %%DATADIR%%/themes/mozilla
-%%THEMES%%@dirrm %%DATADIR%%/themes/orbit-claws
-%%THEMES%%@dirrm %%DATADIR%%/themes/stw
-%%THEMES%%@dirrm %%DATADIR%%/themes/tml02c
-%%THEMES%%@dirrm %%DATADIR%%/themes/tom_2.1.1
-%%THEMES%%@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/sylpheed-claws/plugins
-@dirrm lib/sylpheed-claws
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in
deleted file mode 100644
index f7e72f31691f..000000000000
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
-
-# PROVIDE: courier_imap_imapd_ssl
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_imapd_ssl_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_imapd_ssl
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_imapd_ssl"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
-pidfile="/var/run/imapd-ssl.pid"
-procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-
-start_cmd="imapd_ssl_cmd start"
-stop_cmd="imapd_ssl_cmd stop"
-restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
-
-load_rc_config $name
-
-imapd_ssl_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in
deleted file mode 100644
index 7bfa1625e3b1..000000000000
--- a/mail/courier-imap/files/courier-imap-imapd.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's IMAP service.
-
-# PROVIDE: courier_imap_imapd
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_imapd_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_imapd"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
-pidfile="/var/run/imapd.pid"
-procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-
-start_cmd="imapd_cmd start"
-stop_cmd="imapd_cmd stop"
-restart_cmd="imapd_cmd stop && imapd_cmd start"
-
-load_rc_config $name
-
-imapd_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
deleted file mode 100644
index 3fc4c3d3dab8..000000000000
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
-
-# PROVIDE: courier_imap_pop3d_ssl
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_pop3d_ssl_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_pop3d_ssl
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_pop3d_ssl"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
-pidfile="/var/run/pop3d-ssl.pid"
-procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-
-start_cmd="pop3d_ssl_cmd start"
-stop_cmd="pop3d_ssl_cmd stop"
-restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
-
-load_rc_config $name
-
-pop3d_ssl_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in
deleted file mode 100644
index da0fad1b9312..000000000000
--- a/mail/courier-imap/files/courier-imap-pop3d.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's POP3 service.
-
-# PROVIDE: courier_imap_pop3d
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_pop3d_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_pop3d
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_pop3d"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
-pidfile="/var/run/pop3d.pid"
-procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-
-start_cmd="pop3d_cmd start"
-stop_cmd="pop3d_cmd stop"
-restart_cmd="pop3d_cmd stop && pop3d_cmd start"
-
-load_rc_config $name
-
-pop3d_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 065e2ab2b7c8..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,321 +0,0 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Dec 10th 2005
-# Whom:						ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.1
-#PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-
-CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
-
-LATEST_LINK=	${PORTNAME}23
-
-USE_RC_SUBR=	imapd.sh
-USE_OPENSSL=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
-		--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-user=${CYRUS_USER} \
-		--with-cyrus-group=${CYRUS_GROUP} \
-		--with-sasl=${LOCALBASE} \
-		--with-bdb-libdir=${LOCALBASE}/lib \
-		--with-com_err \
-		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5}
-
-.if defined(WITH_BDB_VER)
-USE_BDB_VER=	${WITH_BDB_VER}
-.else
-USE_BDB_VER=	3
-.endif
-.if ${USE_BDB_VER} == 3
-OPTIONS=	BDB_3		"Use BerkeleyDB v3"	on \
-		BDB_4		"Use BerkeleyDB v4"	off \
-		BDB_41		"Use BerkeleyDB v4.1"	off \
-		BDB_42		"Use BerkeleyDB v4.2"	off \
-		BDB_43		"Use BerkeleyDB v4.3"	off
-.elif ${USE_BDB_VER} == 4
-OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
-		BDB_4		"Use BerkeleyDB v4"	on \
-		BDB_41		"Use BerkeleyDB v4.1"	off \
-		BDB_42		"Use BerkeleyDB v4.2"	off \
-		BDB_43		"Use BerkeleyDB v4.3"	off
-.elif ${USE_BDB_VER} == 41
-OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
-		BDB_4		"Use BerkeleyDB v4"	off \
-		BDB_41		"Use BerkeleyDB v4.1"	on \
-		BDB_42		"Use BerkeleyDB v4.2"	off \
-		BDB_43		"Use BerkeleyDB v4.3"	off
-.elif ${USE_BDB_VER} == 42
-OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
-		BDB_4		"Use BerkeleyDB v4"	off \
-		BDB_41		"Use BerkeleyDB v4.1"	off \
-		BDB_42		"Use BerkeleyDB v4.2"	on \
-		BDB_43		"Use BerkeleyDB v4.3"	off
-.elif ${USE_BDB_VER} == 43
-OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
-		BDB_4		"Use BerkeleyDB v4"	off \
-		BDB_41		"Use BerkeleyDB v4.1"	off \
-		BDB_42		"Use BerkeleyDB v4.2"	off \
-		BDB_43		"Use BerkeleyDB v4.3"	on
-.else
-BROKEN=		"WITH_BDB_VER must be 3, 4, 41, 42 or 43"
-.endif
-
-OPTIONS+=	DRAC		"Enable DRAC support"			off
-OPTIONS+=	IDLED		"Enable IMAP idled support"		off
-OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader"			off
-OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
-OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
-OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
-OPTIONS+=	NNTP		"Enable NNTP support (BROKEN)"		off
-OPTIONS+=	REPLICATION	"Enable replication"			off
-OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
-		SNMP_5		"Enable SNMP support using net-snmp v5"	off
-OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
-
-BDB_VERS=	3 4 41 42 43
-
-.include <bsd.port.pre.mk>
-
-BDB_W:=
-BDB_WO:=
-.for v in ${BDB_VERS}
-BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
-BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
-.endfor
-BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
-BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
-BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
-
-.if ${BDB_NUM_W} == 0
-.if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
-BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
-.endif
-WITH_BDB_${USE_BDB_VER}=	true
-.elif ${BDB_NUM_W} != 1
-BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
-.endif
-.if defined(WITH_BDB_3)
-BDB_VER=	3
-.elif defined(WITH_BDB_4)
-BDB_VER=	4
-USE_BDB=	40
-.elif defined(WITH_BDB_41)
-BDB_VER=	41
-.elif defined(WITH_BDB_42)
-BDB_VER=	42
-BDB_SUFFIX=	-4.2
-.elif defined(WITH_BDB_43)
-BDB_VER=	43
-BDB_SUFFIX=	-4.3
-.endif
-USE_BDB?=	${BDB_VER}
-BDB_SUFFIX?=	${BDB_VER}
-CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
-		--with-bdb=db${BDB_SUFFIX}
-
-.if defined(WITH_NNTP)
-IGNORE=		NNTP support is broken by the original distribution
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+=	NNTP=""
-.else
-PLIST_SUB+=	NNTP="@comment "
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	MURDER=""
-.else
-PLIST_SUB+=	MURDER="@comment "
-.endif
-
-.if defined(WITH_IDLED)
-CONFIGURE_ARGS+=--enable-idled
-PLIST_SUB+=	IDLED=""
-.else
-PLIST_SUB+=	IDLED="@comment "
-.endif
-
-.if defined(WITH_REPLICATION)
-CONFIGURE_ARGS+=--enable-replication
-PLIST_SUB+=	REPLICATION=""
-.else
-PLIST_SUB+=	REPLICATION="@comment "
-.endif
-
-.if defined(WITH_LISTEXT)
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if defined(WITH_NETSCAPEHACK)
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if defined(WITH_DRAC)
-EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
-		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
-		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf:259 autoheader:259
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
-BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
-.endif
-.if defined(WITH_SNMP_4)
-LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
-.elif defined(WITH_SNMP_5)
-LIB_DEPENDS+=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-.if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-snmp=no
-.endif
-
-.if defined(WITH_LDAP_PTLOADER)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+=	LDAP_PTLOADER=""
-.else
-PLIST_SUB+=	LDAP_PTLOADER="@comment "
-.endif
-
-.if defined(WITH_PASS8BITHACK)
-EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
-.endif
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3=		imclient.3
-MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
-		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
-CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
-		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
-		make_md5.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
-		quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
-		sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
-		timsieved.8 tls_prune.8 unexpunge.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-replication \
-		install-sieve install-snmpmon install-testing \
-		install-upgrade install-virtdomains mailing-list man \
-		notes os overview questions readme sieve sieve-protocol \
-		specs
-
-CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
-		small.conf
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
-post-patch:
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			-e "s|%%PREFIX%%|${PREFIX}|g" \
-			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
-			${.CURDIR}/pkg-install > ${PKGINSTALL}
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			-e "s|%%PREFIX%%|${PREFIX}|g" \
-			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
-			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
-			${WRKSRC}/tools/mkimap
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-				  -e "s|/usr/sieve|/var/imap/sieve|g" \
-			${WRKSRC}/tools/masssievec
-.if ${PERL_LEVEL} < 500600
-		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
-			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
-.endif
-.if defined(WITH_DRAC)
-		@${RM} -rf ${WRKSRC}/autom4te.cache
-.endif
-
-post-install:
-.for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
-		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
-			>>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
-		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
-		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
-.if !defined(NOPORTDOCS)
-		@${MKDIR} ${DOCSDIR}/man
-		@${MKDIR} ${DOCSDIR}/text
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
-		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
-			${DOCSDIR}/man/${f}.html; \
-		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
-			>>${TMPPLIST}; \
-		fi
-.endfor
-.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
-		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
-.endfor
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
-		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
-.endif
-		@${MKDIR} ${EXAMPLESDIR}
-		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
-.for f in ${CONFS}
-		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
-		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
-			>>${TMPPLIST}
-		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-			${PREFIX}/cyrus/bin/mkimap
-		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
-			${PREFIX}/cyrus/bin/masssievec
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-			POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index e4ac443a55df..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cyrus-imapd-2.3.1.tar.gz) = cde15876d5c953bba9ad9f7811aff695
-SHA256 (cyrus-imapd-2.3.1.tar.gz) = 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c
-SIZE (cyrus-imapd-2.3.1.tar.gz) = 2212999
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4
deleted file mode 100644
index 72e3b641475d..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: cmulocal/berkdb.m4
-diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
---- cmulocal/berkdb.m4.orig	Sat Nov 27 06:41:58 2004
-+++ cmulocal/berkdb.m4	Sat Dec 10 16:28:44 2005
-@@ -212,10 +212,11 @@
- 	fi
- 
- 	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
--	    AC_TRY_LINK([#include <db.h>],
-+	    AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- 	    [db_create(NULL, NULL, 0);],
- 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
-             dblib="no")
-@@ -223,7 +224,8 @@
-           done
-         if test "$dblib" = "no"; then
- 	    LIBS="$saved_LIBS -ldb"
--	    AC_TRY_LINK([#include <db.h>],
-+	    AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- 	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
- 	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
-             dblib="no")
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
deleted file mode 100644
index 829d92d23585..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: cmulocal/ucdsnmp.m4
-diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
---- cmulocal/ucdsnmp.m4.orig	Tue May 25 10:27:58 2004
-+++ cmulocal/ucdsnmp.m4	Sat Dec 10 16:34:09 2005
-@@ -31,9 +31,12 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
-       AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
-       AC_SUBST(LIB_UCDSNMP)
-+      AC_SUBST(LDFLAGS_UCDSNMP)
-       AC_MSG_RESULT(yes)
-     else
-       AC_MSG_RESULT(no)
-@@ -59,7 +62,7 @@
-     LIB_UCDSNMP=""
-     if test "$with_snmp" != no; then
-       AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-     fi
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
deleted file mode 100644
index 1a89d771ee93..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig	Sat May 29 04:59:21 2004
-+++ configure.in	Sat May 29 05:03:04 2004
-@@ -933,7 +933,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl    eval `${PERL} -V:cccdlflags`
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
-     AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index d0f32d1bbe81..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,412 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of cleartext passwords on the wire.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# The cyrusdb backend to use for mailbox annotations.
-# Allowed values: berkeley, skiplist
-#
-#annotation_db: skiplist
-
-# The cyrusdb backend to use for the duplicate delivery suppression
-# and sieve.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#duplicate_db: berkeley-nosync
-
-# The cyrusdb backend to use for the mailbox list.
-# Allowed values: flat, berkeley, skiplist
-#
-#mboxlist_db: skiplist
-
-# The cyrusdb backend to use for the pts cache.
-# Allowed values: berkeley, skiplist
-#
-#ptscache_db: berkeley
-
-# The cyrusdb backend to use for the seen state.
-# Allowed values: flat, berkeley, skiplist
-#
-#seenstate_db: skiplist
-
-# The cyrusdb backend to use for the subscriptions list.
-# Allowed values: flat, berkeley, skiplist
-#
-#subscription_db: flat
-
-# The cyrusdb backend to use for the TLS cache.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#tlscache_db: berkeley-nosync
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
deleted file mode 100644
index b8dd83bd4a01..000000000000
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
-
-# Define these cyrus_imapd_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO"	# Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master"	# Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. %%RC_SUBR%%
-
-name="cyrus_imapd"
-rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
-stop_postcmd="cyrus_imapd_poststop"
-
-cyrus_imapd_poststop() {
-	/bin/rm -f ${pidfile}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd24/files/pass8bit.diff b/mail/cyrus-imapd24/files/pass8bit.diff
deleted file mode 100644
index 74389a491c30..000000000000
--- a/mail/cyrus-imapd24/files/pass8bit.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: imap/message.c
-diff -u -p imap/message.c.orig imap/message.c
---- imap/message.c.orig	Sat Feb 28 02:44:55 2004
-+++ imap/message.c	Thu Oct  7 20:21:04 2004
-@@ -227,6 +227,7 @@ unsigned size;
-     int n;
-     int sawcr = 0, sawnl;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
-     int inheader = 1, blankline = 1;
- 
-     while (size) {
-@@ -262,7 +263,7 @@ unsigned size;
- 			/* We have been configured to reject all mail of this
- 			   form. */
- 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
--		    } else {
-+		    } else if (!pass8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			*p = 'X';
-Index: imap/spool.c
-diff -u -p imap/spool.c.orig imap/spool.c
---- imap/spool.c.orig	Fri Mar  5 01:09:34 2004
-+++ imap/spool.c	Thu Oct  7 20:20:57 2004
-@@ -140,6 +140,7 @@ static int parseheader(struct protstream
-     state s = NAME_START;
-     int r = 0;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
-     const char **skip = NULL;
- 
-     if (namelen == 0) {
-@@ -266,7 +267,7 @@ static int parseheader(struct protstream
- 			   form. */
- 			r = IMAP_MESSAGE_CONTAINS8BIT;
- 			goto ph_error;
--		    } else {
-+		    } else if (!pass8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			c = 'X';
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Jul 22 04:07:45 2004
-+++ lib/imapoptions	Thu Oct  7 20:00:04 2004
-@@ -95,6 +95,12 @@
- { "afspts_mycell", NULL, STRING }
- /* Cell to use for AFS PTS lookups.  Defaults to the local cell. */
- 
-+{ "pass8bit", 0, SWITCH }
-+/* If enabled, lmtpd accepts messages with 8-bit characters in the
-+   headers without changing to `X'.  This option is strongly not
-+   recommended.  (A proper soultion to non-ASCII characters in headers
-+   is offered by RFC 2047 and its predecessors.) */
-+
- { "allowallsubscribe", 0, SWITCH }
- /* Allow subscription to nonexistent mailboxes.  This option is
-    typically used on backend servers in a Murder so that users can
diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in
deleted file mode 100644
index 71800e59efb8..000000000000
--- a/mail/cyrus-imapd24/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig	Sat May 15 05:59:10 2004
-+++ Makefile.in	Wed May 19 00:23:11 2004
-@@ -97,13 +97,13 @@
- 	touch distcvs
- 
- install::
--	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
--	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
-+	$(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin
-+	$(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib
-+	$(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man1
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man3
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man5
-+	$(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
- 	@for d in  $(SUBDIRS); \
- 	do \
- 		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
deleted file mode 100644
index b88c0c0e0cde..000000000000
--- a/mail/cyrus-imapd24/files/patch-configure
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Tue Dec  6 01:00:41 2005
-+++ configure	Sat Dec 10 14:01:36 2005
-@@ -310,6 +310,7 @@
- #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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -8776,7 +8777,7 @@
- 	fi
- 
- 	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
- 	    cat >conftest.$ac_ext <<_ACEOF
-@@ -8785,6 +8786,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
-@@ -16659,6 +16661,7 @@
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
- 
- fi
-@@ -17233,7 +17236,9 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NETSNMP 1
-@@ -17482,7 +17487,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
- 
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -18306,6 +18311,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
diff --git a/mail/cyrus-imapd24/files/patch-imap::Makefile.in b/mail/cyrus-imapd24/files/patch-imap::Makefile.in
deleted file mode 100644
index 163deb2807c3..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Nov 18 00:46:14 2005
-+++ imap/Makefile.in	Sat Dec 10 16:46:31 2005
-@@ -130,10 +130,10 @@
- 
- 
- install:
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
- 	for file in $(PROGS); \
- 	do \
--		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- 	done
- 	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
- 	ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
-@@ -219,13 +219,13 @@
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- 	$(DEPLIBS) $(SERVICE)
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
deleted file mode 100644
index e1fd1efa8c06..000000000000
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Sun Jul 13 05:10:56 2003
-+++ imtest/imtest.c	Fri Jul 18 00:52:29 2003
-@@ -51,6 +51,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -419,8 +420,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
deleted file mode 100644
index 543ece89f131..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Mar 11 06:25:39 2004
-+++ lib/Makefile.in	Wed May 19 00:34:19 2004
-@@ -102,7 +102,7 @@
- all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
- 
- install:
--	$(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-+	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
- 	 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c
deleted file mode 100644
index 5cbb64001209..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/libcyr_cfg.c
-diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c
---- lib/libcyr_cfg.c.orig	Wed Mar 10 00:05:58 2004
-+++ lib/libcyr_cfg.c	Fri Feb 25 00:06:44 2005
-@@ -52,7 +52,7 @@
- #include "libcyr_cfg.h"
- #include "cyrusdb.h"
- 
--#if defined(__GNUC__) && __GNUC__ > 1
-+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER)
- /* We can use the GCC union constructor extension */
- #define CFGVAL(t,v)	(union cyrus_config_value)((t)(v))
- #else
diff --git a/mail/cyrus-imapd24/files/patch-man::Makefile.in b/mail/cyrus-imapd24/files/patch-man::Makefile.in
deleted file mode 100644
index 1b0061897d43..000000000000
--- a/mail/cyrus-imapd24/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Wed May 11 00:02:35 2005
-+++ man/Makefile.in	Sat Dec 10 15:26:05 2005
-@@ -50,6 +50,7 @@
- SHELL = /bin/sh
- 
- prefix = @prefix@
-+cyrus_prefix = @cyrus_prefix@
- 
- mandir = @mandir@
- 
-@@ -95,7 +96,7 @@
- 	done
- 	for file in $(MAN8); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- 	done
- 
- clean:
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in
deleted file mode 100644
index c828109f247e..000000000000
--- a/mail/cyrus-imapd24/files/patch-master::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Sat May 29 03:03:05 2004
-+++ master/Makefile.in	Wed Jul 21 04:13:16 2004
-@@ -58,7 +58,7 @@
- DEPLIBS = @DEPLIBS@
- 
- CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
- LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
- 
- SHELL = /bin/sh
-@@ -76,10 +76,10 @@
- all: $(PROGS) $(LOBJS)
- 
- install:
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
- 	for file in $(PROGS); \
- 	do \
--		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- 	done
- 
- .c.o:
diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
deleted file mode 100644
index d49703fa25b4..000000000000
--- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: notifyd/Makefile.in
-diff -u notifyd/Makefile.in.orig notifyd/Makefile.in
---- notifyd/Makefile.in.orig	Wed Nov 12 13:02:10 2003
-+++ notifyd/Makefile.in	Fri Feb 13 18:41:07 2004
-@@ -79,7 +79,7 @@
- all: notifyd
- 
- install:
--	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-+	$(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path)
- 
- OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
- 
diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index 66140bf53219..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig	Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL	Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
-     'INC'	=> "-I../../lib $SASL_INC $OPENSSL_INC", 
-     'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index bde3d77b763e..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig	Thu Oct 23 03:50:27 2003
-+++ perl/sieve/managesieve/Makefile.PL	Sun Dec 12 04:21:55 2004
-@@ -64,3 +64,10 @@
-     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'	=> "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
deleted file mode 100644
index 99d494cf81d4..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in	Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
- 
-@@ -60,8 +61,8 @@
- dist: $(BUILT_SOURCES)
- 
- install: sievec
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
--	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
- 
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
deleted file mode 100644
index 4e0bc2841c2c..000000000000
--- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timsieved/Makefile.in
-diff -u timsieved/Makefile.in.orig timsieved/Makefile.in
---- timsieved/Makefile.in.orig	Wed Nov 12 13:02:14 2003
-+++ timsieved/Makefile.in	Fri Feb 13 18:51:17 2004
-@@ -79,7 +79,7 @@
- all: timsieved
- 
- install:
--	$(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-+	$(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path)
- 
- OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
- 	../imap/tls.o
diff --git a/mail/cyrus-imapd24/files/patch-tools::mkimap b/mail/cyrus-imapd24/files/patch-tools::mkimap
deleted file mode 100644
index 9ee1539e3776..000000000000
--- a/mail/cyrus-imapd24/files/patch-tools::mkimap
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Fri Dec  2 07:30:22 2005
-+++ tools/mkimap	Sat Dec 10 14:08:11 2005
-@@ -90,6 +90,9 @@
- 
- $imapdconf = shift || "/etc/imapd.conf";
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- push @configs, $imapdconf;
- 
- while ($conf = shift @configs) {
-@@ -100,6 +103,7 @@
- 
- print "configuring $d...\n";
- 
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
- 
- mkdir "proc", 0755 || warn "can't create $d/proc: $!";
-@@ -110,12 +114,15 @@
- mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!";
- mkdir "sync", 0755 || warn "can't create $d/sync: $!";
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
-     print "creating $part...\n";
-     mkdir $part, 0755 || warn "can't create $part: $!";
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755 || warn "can't create $part/stage.: $!";
-     mkdir "sync.", 0755 || warn "can't create $part/sync.: $!";
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
deleted file mode 100644
index e0dd1b8bb7fc..000000000000
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			rm $1
-			;;
-		1)	# config file exists and differs
-			;;
-		*)	# no config file exists
-			;;
-	esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
deleted file mode 100644
index 79d06da9dd9b..000000000000
--- a/mail/cyrus-imapd24/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol. 
-The Cyrus IMAP server is a scaleable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers.  It differs from other
-IMAP server implementations in that it is run on "sealed" servers, where
-users are not normally permitted to log in.  The mailbox database is stored
-in parts of the filesystem that are private to the Cyrus IMAP system.  All
-user access to mail is through software using the IMAP, POP3, or KPOP
-protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability.  Multiple concurrent
-read/write connections to the same mailbox are permitted.  The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
-WWW: http://asg.web.cmu.edu/cyrus/
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
deleted file mode 100644
index d2ba72f75349..000000000000
--- a/mail/cyrus-imapd24/pkg-install
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version";
-			echo "   of the port.  See $1.dist for details.";
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $2 $1
-			;;
-	esac
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (2000/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message
deleted file mode 100644
index ff816e46e925..000000000000
--- a/mail/cyrus-imapd24/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
deleted file mode 100644
index c66270b2e372..000000000000
--- a/mail/cyrus-imapd24/pkg-plist
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-bin/synctest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyr_expire
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-%%NNTP%%cyrus/bin/fetchnews
-cyrus/bin/fud
-%%IDLED%%cyrus/bin/idled
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-%%REPLICATION%%cyrus/bin/make_md5
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-%%NNTP%%cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-%%LDAP_PTLOADER%%cyrus/bin/ptdump
-%%LDAP_PTLOADER%%cyrus/bin/ptexpire
-%%LDAP_PTLOADER%%cyrus/bin/ptloader
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/sievec
-cyrus/bin/smmapd
-cyrus/bin/squatter
-%%REPLICATION%%cyrus/bin/sync_client
-%%REPLICATION%%cyrus/bin/sync_reset
-%%REPLICATION%%cyrus/bin/sync_server
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/unexpunge
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/byteorder64.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/hmac-md5.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/md5.h
-include/cyrus/message_uuid.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/strhash.o
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus_min.a
-lib/libcyrus.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%%EXAMPLESDIR%%/imapd.conf
-@dirrm cyrus/bin
-@dirrm include/cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
deleted file mode 100644
index cb7adc9d2047..000000000000
--- a/mail/dbmail-devel/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for:	dbmail
-# Date created:				07/26/2003
-# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbmail
-PORTVERSION=	2.0.7
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.0/
-PKGNAMESUFFIX=	-${DATABASE}
-
-MAINTAINER=	mark_sf@kikg.ifmo.ru
-COMMENT=	An SQL database-based mail system (POP3 and IMAP)
-
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	YES
-USE_OPENSSL=	YES
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
-INSTALLS_SHLIB=	yes
-
-CFLAGS += -fPIC
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=	--with-pgsql
-USE_PGSQL=		yes
-DATABASE=		postgresql
-PLIST_SUB+=		PGSQL=""
-PLIST_SUB+=		MYSQL="@comment "
-LDFLAGS+=		-L${LOCALBASE}/lib/
-.else
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql
-DATABASE=		mysql
-PLIST_SUB+=		MYSQL=""
-PLIST_SUB+=		PGSQL="@comment "
-CFLAGS+=		-I${LOCALBASE}/include/mysql
-LDFLAGS+=		-L${LOCALBASE}/lib/mysql
-.endif
-
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
-PORTDOCS=		INSTALL README EXTRAS
-
-MAN1=			dbmail-smtp.1
-MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
-			dbmail-users.8 dbmail-util.8
-MANCOMPRESSED=		no
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} "   By default dbmail uses MySQL backend database."
-	@${ECHO} "   To build dbmail with PostgreSQL as backend database,"
-	@${ECHO} "	define WITH_POSTGRESQL"
-	@${ECHO} ""
-
-post-patch:
-	${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	${FIND} ${WRKSRC} -name '*.orig' -type f -delete
-
-post-configure:
-	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
-				${WRKSRC}/dbmail.h
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@${MKDIR} ${DATADIR}/sql
-	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
-	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${ECHO} ""
-	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
-	@${ECHO} ""
-	@${ECHO} "	*) Don't forget to update the database using a script from"
-	@${ECHO} "	   ${DATADIR}/sql/"
-	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
-	@${ECHO} "	*) Read the upgrading notes."
-	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
-	@${ECHO} "	*) dbmail can be controled by setting dbmail_imapd_enable,"
-	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
-	@${ECHO} "	   /etc/rc.conf."
-	@${ECHO} ""
-
-.include <bsd.port.mk>
diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo
deleted file mode 100644
index b2ac397cfd4c..000000000000
--- a/mail/dbmail-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.0.7.tar.gz) = 11e6eded9e5ec533f6e6ed11fc62a4d8
-SHA256 (dbmail-2.0.7.tar.gz) = ef678002a0f6eed3ae8babc17760e36a76e678852c50d70d8dee1fe693f54026
-SIZE (dbmail-2.0.7.tar.gz) = 584457
diff --git a/mail/dbmail-devel/files/dbmail-imapd.sh.in b/mail/dbmail-devel/files/dbmail-imapd.sh.in
deleted file mode 100644
index 82505e96d9b0..000000000000
--- a/mail/dbmail-devel/files/dbmail-imapd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-imapd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-imapd: 
-#
-#dbmail_imapd_enable="YES"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_imapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail-devel/files/dbmail-lmtpd.sh.in b/mail/dbmail-devel/files/dbmail-lmtpd.sh.in
deleted file mode 100644
index f1133f43a70e..000000000000
--- a/mail/dbmail-devel/files/dbmail-lmtpd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-lmtpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: 
-#
-#dbmail_lmtpd_enable="YES"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_lmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail-devel/files/dbmail-pop3d.sh.in b/mail/dbmail-devel/files/dbmail-pop3d.sh.in
deleted file mode 100644
index d787f6a668e7..000000000000
--- a/mail/dbmail-devel/files/dbmail-pop3d.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-pop3d
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
-#
-#dbmail_pop3d_enable="YES"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_pop3d
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail-devel/files/patch-2.0.7_001_266 b/mail/dbmail-devel/files/patch-2.0.7_001_266
deleted file mode 100644
index b3650d832c24..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_001_266
+++ /dev/null
@@ -1,27 +0,0 @@
---- server.c.orig	Wed Aug 24 13:35:38 2005
-+++ server.c	Tue Sep 13 22:21:59 2005
-@@ -119,7 +119,7 @@
-   
-  	trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop");
-  	while (!GeneralStopRequested) {
--		if (db_connect() != 0) {
-+		if (db_check_connection() != 0) {
- 			
- 			if (! stopped) 
- 				manage_stop_children();
-@@ -128,12 +128,11 @@
- 			sleep(10);
- 			
- 		} else {
--			if (stopped) 
-+			if (stopped) {
-+				manage_restart_children();
- 				stopped=0;
-- 			
--			db_disconnect();
-+			}
- 
--			manage_restart_children();
- 			manage_spare_children();
- 
- 			sleep(1);
diff --git a/mail/dbmail-devel/files/patch-2.0.7_002 b/mail/dbmail-devel/files/patch-2.0.7_002
deleted file mode 100644
index 81d8790d3614..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_002
+++ /dev/null
@@ -1,1397 +0,0 @@
---- ChangeLog	(revision 1888)
-+++ ChangeLog	(revision 1889)
-@@ -1,3 +1,17 @@
-+2005-09-27  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
-+	  debian/changelog, server.c:
-+	do not close database connection on startup (closes: #271)
-+
-+2005-09-23  Paul J Stevens <paul@nfg.nl>
-+
-+	* debian/control, debian/patches/00list, 
-+	  debian/patches/04_mailfilter.dpatch:
-+	added mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	fix some compiler warnings in mailfilter patch
-+
- 2005-09-14  Paul J Stevens <paul@nfg.nl>
- 
- 	* debian/control:
---- buildtools/config.guess	(revision 1888)
-+++ buildtools/config.guess	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-08-03'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,13 +17,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -66,11 +68,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -123,7 +125,7 @@
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -196,55 +198,20 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    luna88k:OpenBSD:*:*)
--    	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -297,40 +264,43 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-     *:z/VM:*:*)
- 	echo s390-ibm-zvmoe
--	exit 0 ;;
-+	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -372,10 +342,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +357,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +371,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +428,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +470,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +500,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -544,14 +515,18 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:[45])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-@@ -565,28 +540,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -648,9 +623,19 @@
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -658,11 +643,11 @@
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +675,166 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
- 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
-+	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
--    amd64:CYGWIN*:*:*)
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     crisv32:Linux:*:*)
- 	echo crisv32-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -862,7 +852,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -881,14 +871,17 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +895,7 @@
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +903,25 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +939,15 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
-+		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
-+		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
-+		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -982,15 +975,18 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -998,27 +994,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--	i*86:syllable:*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1026,15 +1022,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1052,73 +1049,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
-+	exit ;;
-     M68*:*:R3V[5678]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1126,65 +1123,65 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo ${UNAME_MACHINE}-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-@@ -1192,7 +1189,7 @@
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1200,25 +1197,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
-+	exit ;;
-     NSE-?:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1229,41 +1226,44 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     *:*VMS:*:*)
-     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
--	    A*) echo alpha-dec-vms && exit 0 ;;
--	    I*) echo ia64-dec-vms && exit 0 ;;
--	    V*) echo vax-dec-vms && exit 0 ;;
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
- 	esac ;;
-     *:XENIX:*:SysV)
- 	echo i386-pc-xenix
--	exit 0 ;;
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1295,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1384,11 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1397,22 +1398,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
---- buildtools/config.sub	(revision 1888)
-+++ buildtools/config.sub	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-07-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +21,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
- #
-@@ -83,11 +84,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +100,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -247,6 +248,7 @@
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-@@ -255,13 +257,14 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| ms1 \
- 	| msp430 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b \
-@@ -273,6 +276,9 @@
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -321,6 +327,7 @@
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-@@ -329,6 +336,7 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| mmix-* \
-+	| ms1-* \
- 	| msp430-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
-@@ -336,7 +344,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -351,6 +359,8 @@
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -761,9 +771,8 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
- 		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -1089,12 +1098,9 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
-@@ -1181,7 +1187,8 @@
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1199,7 +1206,7 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
-@@ -1388,6 +1395,9 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-@@ -1559,7 +1569,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mail/dbmail-devel/files/patch-2.0.7_002_271 b/mail/dbmail-devel/files/patch-2.0.7_002_271
deleted file mode 100644
index 40a21687020a..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_002_271
+++ /dev/null
@@ -1,10 +0,0 @@
---- server.c	(revision 1888)
-+++ server.c	(revision 1889)
-@@ -98,7 +98,6 @@
- 		return -1;
- 	if (db_check_version() != 0)
- 		return -1;
--	db_disconnect();
- 		
- 	ParentPID = getpid();
- 	Restart = 0;
diff --git a/mail/dbmail-devel/files/patch-2.0.7_003 b/mail/dbmail-devel/files/patch-2.0.7_003
deleted file mode 100644
index 1b83d01d5dca..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_003
+++ /dev/null
@@ -1,25 +0,0 @@
---- serverchild.c	(revision 1889)
-+++ serverchild.c	(revision 1890)
-@@ -312,19 +312,16 @@
- 
- 		client.timeoutMsg = info->timeoutMsg;
- 		client.timeout = info->timeout;
--		strncpy(client.ip, inet_ntoa(saClient.sin_addr),
--			IPNUM_LEN);
-+		strncpy(client.ip, inet_ntoa(saClient.sin_addr), IPNUM_LEN);
- 		client.clientname[0] = '\0';
- 
- 		if (info->resolveIP) {
--			clientHost =
--			    gethostbyaddr((char *) &saClient.sin_addr,
-+			clientHost = gethostbyaddr((char *) &saClient.sin_addr,
- 					  sizeof(saClient.sin_addr),
- 					  saClient.sin_family);
- 
- 			if (clientHost && clientHost->h_name)
--				strncpy(client.clientname,
--					clientHost->h_name, FIELDSIZE);
-+				strncpy(client.clientname, clientHost->h_name, FIELDSIZE);
- 
- 			trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]",
- 					__FILE__, __func__,
diff --git a/mail/dbmail-devel/files/patch-2.0.7_003_272 b/mail/dbmail-devel/files/patch-2.0.7_003_272
deleted file mode 100644
index 0bc97c9d9a2b..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_003_272
+++ /dev/null
@@ -1,22 +0,0 @@
---- sql/mysql/create_tables.mysql	(revision 1889)
-+++ sql/mysql/create_tables.mysql	(revision 1890)
-@@ -118,7 +118,7 @@
- CREATE TABLE dbmail_messageblks (
-    messageblk_idnr bigint(21) NOT NULL auto_increment,
-    physmessage_id bigint(21) DEFAULT '0' NOT NULL,
--   messageblk longtext NOT NULL,
-+   messageblk longblob NOT NULL,
-    blocksize bigint(21) DEFAULT '0' NOT NULL,
-    is_header tinyint(1) DEFAULT '0' NOT NULL,
-    PRIMARY KEY (messageblk_idnr),
---- sql/mysql/create_tables_innoDB.mysql	(revision 1889)
-+++ sql/mysql/create_tables_innoDB.mysql	(revision 1890)
-@@ -148,7 +148,7 @@
- CREATE TABLE dbmail_messageblks (
- 	messageblk_idnr bigint(21) NOT NULL auto_increment,
- 	physmessage_id bigint(21) NOT NULL default '0',
--	messageblk longtext NOT NULL,
-+	messageblk longblob NOT NULL,
- 	blocksize bigint(21) NOT NULL default '0',
- 	is_header tinyint(1) NOT NULL default '0',
- 	PRIMARY KEY (messageblk_idnr),
diff --git a/mail/dbmail-devel/files/patch-2.0.7_004 b/mail/dbmail-devel/files/patch-2.0.7_004
deleted file mode 100644
index 8bbd3b8c3f92..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_004
+++ /dev/null
@@ -1,95 +0,0 @@
---- ChangeLog	(revision 1890)
-+++ ChangeLog	(revision 1904)
-@@ -1,3 +1,12 @@
-+2005-10-01  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	added postgres table to mailfilter patch
-+	* debian/changelog, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	change dbmail_messageblks.messageblk from longtext to longblob in mysql
-+	create scripts
-+
- 2005-09-27  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
---- dsn.c	(revision 1890)
-+++ dsn.c	(revision 1904)
-@@ -309,8 +309,10 @@
- 	 */
- 	else {		/* from: 'if (delivery->useridnr != 0)' */
- 
--		alias_count =
--		    auth_check_user_ext(delivery->address,
-+		if (! strlen(delivery->address))
-+			return 0;
-+		
-+		alias_count = auth_check_user_ext(delivery->address,
- 					delivery->userids,
- 					delivery->forwards, 0);
- 		trace(TRACE_DEBUG,
---- auth/authsql.c	(revision 1890)
-+++ auth/authsql.c	(revision 1904)
-@@ -385,6 +385,9 @@
- 		return 0;
- 	}
- 	
-+	if (strlen(username) < 1)
-+		return 0;
-+
- 	saveres = db_get_result_set();
- 	db_set_result_set(NULL);
- 
---- main.c	(revision 1890)
-+++ main.c	(revision 1904)
-@@ -405,27 +405,25 @@
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
--		trace(TRACE_DEBUG, "main(): scanning for [%s]",
--		      deliver_to_header);
--		if (mail_adr_list(deliver_to_header, &users, &mimelist) !=
--		    0) {
--			trace(TRACE_STOP,
--			      "main(): scanner found no email addresses (scanned for %s)",
-+		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
-+		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
-+			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
- 			      deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
- 
- 		/* Loop through the users list, moving the entries into the dsnusers list. */
--		for (tmp = list_getstart(&users); tmp != NULL;
--		     tmp = tmp->nextnode) {
--			deliver_to_user_t dsnuser;
-+		for (tmp = list_getstart(&users); tmp != NULL; tmp = tmp->nextnode) {
- 
-+			if (! (strlen((char *)tmp->data) > 0))
-+				continue;
-+
-+			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser,
--				     sizeof(deliver_to_user_t));
-+			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
- 		}
- 	}
- 
-@@ -433,11 +431,10 @@
- 	if (deliver_to_mailbox != NULL) {
- 		trace(TRACE_DEBUG, "main(): setting mailbox for all deliveries to [%s]",
- 		      deliver_to_mailbox);
-+		
- 		/* Loop through the dsnusers list, setting the destination mailbox. */
--		for (tmp = list_getstart(&dsnusers); tmp != NULL;
--		     tmp = tmp->nextnode) {
-+		for (tmp = list_getstart(&dsnusers); tmp != NULL; tmp = tmp->nextnode) 
- 			((deliver_to_user_t *)tmp->data)->mailbox = dm_strdup(deliver_to_mailbox);
--		}
- 	}
- 
- 	if (dsnuser_resolve_list(&dsnusers) == -1) {
diff --git a/mail/dbmail-devel/files/patch-2.0.7_005 b/mail/dbmail-devel/files/patch-2.0.7_005
deleted file mode 100644
index 573a8e836f0b..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_005
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog	(revision 1904)
-+++ ChangeLog	(revision 1905)
-@@ -1,3 +1,8 @@
-+2005-10-18  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, auth/authsql.c, dsn.c, main.c:
-+	ignore empty addresses in delivery chain
-+
- 2005-10-01  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, debian/patches/04_mailfilter.dpatch:
diff --git a/mail/dbmail-devel/files/patch-2.0.7_005_277 b/mail/dbmail-devel/files/patch-2.0.7_005_277
deleted file mode 100644
index b659de88aac4..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_005_277
+++ /dev/null
@@ -1,38 +0,0 @@
---- imapcommands.c	(revision 1904)
-+++ imapcommands.c	(revision 1905)
-@@ -1787,6 +1787,8 @@
- 	if (args[i + 1]) {
- 		struct tm tm;
- 
-+		memset(&tm, 0, sizeof(struct tm));
-+
- 		if (strptime(args[i], "%d-%b-%Y %T", &tm) != NULL)
- 			strftime(sqldate,
- 				 sizeof(sqldate), "%Y-%m-%d %H:%M:%S",
---- imaputil.c	(revision 1904)
-+++ imaputil.c	(revision 1905)
-@@ -1788,13 +1788,14 @@
- 	time_t ltime;
-         char *last;
- 
-+	memset(&tm_sql_date, 0, sizeof(struct tm));
-+	
-         last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date);
-         if ( (last == NULL) || (*last != '\0') ) {
-                 strcpy(_imapdate, IMAP_STANDARD_DATE);
-                 return _imapdate;
-         }
- 
--	/* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */
- 	ltime = mktime (&tm_sql_date);
- 	tm_imap_date = localtime(&ltime);
- 
-@@ -1814,6 +1815,8 @@
- 	struct tm tm;
- 	char *last_char;
- 
-+	memset(&tm, 0, sizeof(struct tm));
-+
- 	last_char = strptime(imapdate, "%d-%b-%Y", &tm);
- 	if (last_char == NULL || *last_char != '\0') {
- 		trace(TRACE_DEBUG, "%s,%s: error parsing IMAP date %s",
diff --git a/mail/dbmail-devel/files/patch-2.0.7_006_281 b/mail/dbmail-devel/files/patch-2.0.7_006_281
deleted file mode 100644
index 40e64bebc054..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_006_281
+++ /dev/null
@@ -1,52 +0,0 @@
---- main.c	(revision 1905)
-+++ main.c	(revision 1948)
-@@ -388,8 +388,8 @@
- 
- 	/* parse the list and scan for field and content */
- 	if (mime_readheader(header, &dummyidx, &mimelist, &dummysize) < 0) {
--		trace(TRACE_ERROR,
--		      "main(): mime_readheader failed to read a header list");
-+		trace(TRACE_ERROR, "%s,%s: mime_readheader failed", 
-+				__FILE__, __func__);
- 		exitcode = EX_TEMPFAIL;
- 		goto freeall;
- 	}
-@@ -400,15 +400,16 @@
- 	if (returnpath.total_nodes == 0)
- 		mail_adr_list("From", &returnpath, &mimelist);
- 	if (returnpath.total_nodes == 0)
--		trace(TRACE_DEBUG, "main(): no return path found.");
-+		trace(TRACE_DEBUG, "%s,%s: no return path found.",
-+				__FILE__,__func__);
- 
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
- 		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
- 		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
--			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
--			      deliver_to_header);
-+			trace(TRACE_STOP, "%s,%s: no email addresses found (scanned for %s)",
-+					__FILE__,__func__, deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
-@@ -419,11 +420,16 @@
- 			if (! (strlen((char *)tmp->data) > 0))
- 				continue;
- 
--			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
-+			if (! list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t))) {
-+				trace(TRACE_ERROR,"%s,%s: out of memory in list_nodeadd", 
-+						__FILE__, __func__);
-+				exitcode = EX_TEMPFAIL;
-+				goto freeall;
-+			}
-+			
- 		}
- 	}
- 
diff --git a/mail/dbmail-devel/files/patch-2.0.7_007 b/mail/dbmail-devel/files/patch-2.0.7_007
deleted file mode 100644
index 6d221a2ef59f..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_007
+++ /dev/null
@@ -1,9108 +0,0 @@
---- Makefile.in	(revision 1905)
-+++ Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,86 +32,209 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- 
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = .
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+bin_PROGRAMS = $(am__EXEEXT_1)
-+sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
-+	dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) \
-+	dbmail-users$(EXEEXT) dbmail-lmtpd$(EXEEXT)
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.in \
-+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-+	THANKS TODO buildtools/config.guess buildtools/config.sub \
-+	buildtools/depcomp buildtools/install-sh buildtools/ltmain.sh \
-+	buildtools/missing buildtools/mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libdbmail_la_DEPENDENCIES =
-+am__libdbmail_la_SOURCES_DIST = config.c debug.c list.c dbmd5.c md5.c \
-+	db.c misc.c mime.c pidfile.c dm_getopt.c server.c \
-+	serverchild.c pool.c header.c pipe.c forward.c dsn.c
-+@USE_DM_GETOPT_TRUE@am__objects_1 = dm_getopt.lo
-+am__objects_2 = config.lo debug.lo list.lo dbmd5.lo md5.lo db.lo \
-+	misc.lo mime.lo pidfile.lo $(am__objects_1)
-+am__objects_3 = server.lo serverchild.lo pool.lo
-+am__objects_4 = header.lo pipe.lo forward.lo dsn.lo
-+am_libdbmail_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-+	$(am__objects_4)
-+libdbmail_la_OBJECTS = $(am_libdbmail_la_OBJECTS)
-+@SIEVE_TRUE@am__EXEEXT_1 = dbmail-sievecmd$(EXEEXT) \
-+@SIEVE_TRUE@	dbmail-timsieved$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+am_dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \
-+	imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
-+	rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) \
-+	dbmsgbuf.$(OBJEXT) acl.$(OBJEXT)
-+dbmail_imapd_OBJECTS = $(am_dbmail_imapd_OBJECTS)
-+dbmail_imapd_DEPENDENCIES = libdbmail.la
-+am_dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
-+dbmail_lmtpd_OBJECTS = $(am_dbmail_lmtpd_OBJECTS)
-+dbmail_lmtpd_DEPENDENCIES = libdbmail.la
-+am_dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT)
-+dbmail_pop3d_OBJECTS = $(am_dbmail_pop3d_OBJECTS)
-+dbmail_pop3d_DEPENDENCIES = libdbmail.la
-+am__dbmail_sievecmd_SOURCES_DIST = sievecmd.c
-+@SIEVE_TRUE@am_dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT)
-+dbmail_sievecmd_OBJECTS = $(am_dbmail_sievecmd_OBJECTS)
-+@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la
-+am_dbmail_smtp_OBJECTS = main.$(OBJEXT)
-+dbmail_smtp_OBJECTS = $(am_dbmail_smtp_OBJECTS)
-+dbmail_smtp_DEPENDENCIES = libdbmail.la
-+am__dbmail_timsieved_SOURCES_DIST = timsieve.c timsieved.c
-+@SIEVE_TRUE@am_dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \
-+@SIEVE_TRUE@	timsieved.$(OBJEXT)
-+dbmail_timsieved_OBJECTS = $(am_dbmail_timsieved_OBJECTS)
-+@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la
-+am_dbmail_users_OBJECTS = user.$(OBJEXT)
-+dbmail_users_OBJECTS = $(am_dbmail_users_OBJECTS)
-+dbmail_users_DEPENDENCIES = libdbmail.la
-+am_dbmail_util_OBJECTS = maintenance.$(OBJEXT)
-+dbmail_util_OBJECTS = $(am_dbmail_util_OBJECTS)
-+dbmail_util_DEPENDENCIES = libdbmail.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdbmail_la_SOURCES) $(dbmail_imapd_SOURCES) \
-+	$(dbmail_lmtpd_SOURCES) $(dbmail_pop3d_SOURCES) \
-+	$(dbmail_sievecmd_SOURCES) $(dbmail_smtp_SOURCES) \
-+	$(dbmail_timsieved_SOURCES) $(dbmail_users_SOURCES) \
-+	$(dbmail_util_SOURCES)
-+DIST_SOURCES = $(am__libdbmail_la_SOURCES_DIST) \
-+	$(dbmail_imapd_SOURCES) $(dbmail_lmtpd_SOURCES) \
-+	$(dbmail_pop3d_SOURCES) $(am__dbmail_sievecmd_SOURCES_DIST) \
-+	$(dbmail_smtp_SOURCES) $(am__dbmail_timsieved_SOURCES_DIST) \
-+	$(dbmail_users_SOURCES) $(dbmail_util_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,343 +242,318 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- SUBDIRS = mysql pgsql auth sort man
--
- @SIEVE_TRUE@SIEVEPROGS = dbmail-sievecmd dbmail-timsieved
--
- @USE_DM_GETOPT_TRUE@DM_GETOPT = dm_getopt.c
--
--bin_PROGRAMS = $(SIEVEPROGS)
--sbin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-util dbmail-users dbmail-lmtpd 
--
- COMMON = config.c debug.c list.c dbmd5.c md5.c db.c misc.c mime.c pidfile.c $(DM_GETOPT)
- SERVER = server.c serverchild.c pool.c
- DELIVER = header.c pipe.c forward.c dsn.c
- 
- # CFLAGS
- AM_CFLAGS = -fomit-frame-pointer
--
- dbmail_smtp_SOURCES = main.c
--dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@
--
-+dbmail_smtp_LDADD = libdbmail.la
- dbmail_pop3d_SOURCES = pop3.c pop3d.c
--dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_pop3d_LDADD = libdbmail.la
- dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c
--dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ 
--
-+dbmail_imapd_LDADD = libdbmail.la
- dbmail_util_SOURCES = maintenance.c
--dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_util_LDADD = libdbmail.la
- dbmail_users_SOURCES = user.c
--dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_users_LDADD = libdbmail.la
- dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
--dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_lmtpd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_sievecmd_SOURCES = sievecmd.c 
--@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_timsieved_SOURCES = timsieve.c timsieved.c
--@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
--lib_LTLIBRARIES = libdbmail.la
-+@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la
-+noinst_LTLIBRARIES = libdbmail.la
- libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER)
--libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(lib_LTLIBRARIES)
-+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libdbmail_la_LDFLAGS = 
--libdbmail_la_DEPENDENCIES = 
--@USE_DM_GETOPT_FALSE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_FALSE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_FALSE@server.lo serverchild.lo pool.lo header.lo pipe.lo \
--@USE_DM_GETOPT_FALSE@forward.lo dsn.lo
--@USE_DM_GETOPT_TRUE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_TRUE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_TRUE@dm_getopt.lo server.lo serverchild.lo pool.lo \
--@USE_DM_GETOPT_TRUE@header.lo pipe.lo forward.lo dsn.lo
--@SIEVE_FALSE@bin_PROGRAMS = 
--@SIEVE_TRUE@bin_PROGRAMS =  dbmail-sievecmd$(EXEEXT) \
--@SIEVE_TRUE@dbmail-timsieved$(EXEEXT)
--sbin_PROGRAMS =  dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
--dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) dbmail-users$(EXEEXT) \
--dbmail-lmtpd$(EXEEXT)
--PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
--
--@SIEVE_TRUE@dbmail_sievecmd_OBJECTS =  sievecmd.$(OBJEXT)
--@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES =  libdbmail.la
--dbmail_sievecmd_LDFLAGS = 
--@SIEVE_TRUE@dbmail_timsieved_OBJECTS =  timsieve.$(OBJEXT) \
--@SIEVE_TRUE@timsieved.$(OBJEXT)
--@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES =  libdbmail.la
--dbmail_timsieved_LDFLAGS = 
--dbmail_smtp_OBJECTS =  main.$(OBJEXT)
--dbmail_smtp_DEPENDENCIES =  libdbmail.la
--dbmail_smtp_LDFLAGS = 
--dbmail_pop3d_OBJECTS =  pop3.$(OBJEXT) pop3d.$(OBJEXT)
--dbmail_pop3d_DEPENDENCIES =  libdbmail.la
--dbmail_pop3d_LDFLAGS = 
--dbmail_imapd_OBJECTS =  quota.$(OBJEXT) imap4.$(OBJEXT) \
--imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
--rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) dbmsgbuf.$(OBJEXT) \
--acl.$(OBJEXT)
--dbmail_imapd_DEPENDENCIES =  libdbmail.la
--dbmail_imapd_LDFLAGS = 
--dbmail_util_OBJECTS =  maintenance.$(OBJEXT)
--dbmail_util_DEPENDENCIES =  libdbmail.la
--dbmail_util_LDFLAGS = 
--dbmail_users_OBJECTS =  user.$(OBJEXT)
--dbmail_users_DEPENDENCIES =  libdbmail.la
--dbmail_users_LDFLAGS = 
--dbmail_lmtpd_OBJECTS =  lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
--dbmail_lmtpd_DEPENDENCIES =  libdbmail.la
--dbmail_lmtpd_LDFLAGS = 
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
--Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \
--config.in configure configure.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/acl.P .deps/config.P .deps/db.P .deps/dbmd5.P \
--.deps/dbmsgbuf.P .deps/dbsearch.P .deps/debug.P .deps/dm_getopt.P \
--.deps/dsn.P .deps/forward.P .deps/header.P .deps/imap4.P \
--.deps/imapcommands.P .deps/imapd.P .deps/imaputil.P .deps/list.P \
--.deps/lmtp.P .deps/lmtpd.P .deps/main.P .deps/maintenance.P .deps/md5.P \
--.deps/memblock.P .deps/mime.P .deps/misc.P .deps/pidfile.P .deps/pipe.P \
--.deps/pool.P .deps/pop3.P .deps/pop3d.P .deps/quota.P .deps/rfcmsg.P \
--.deps/server.P .deps/serverchild.P .deps/sievecmd.P .deps/timsieve.P \
--.deps/timsieved.P .deps/user.P
--SOURCES = $(libdbmail_la_SOURCES) $(dbmail_sievecmd_SOURCES) $(dbmail_timsieved_SOURCES) $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_util_SOURCES) $(dbmail_users_SOURCES) $(dbmail_lmtpd_SOURCES)
--OBJECTS = $(libdbmail_la_OBJECTS) $(dbmail_sievecmd_OBJECTS) $(dbmail_timsieved_OBJECTS) $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_util_OBJECTS) $(dbmail_users_OBJECTS) $(dbmail_lmtpd_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-+.SUFFIXES: .c .lo .o .obj
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
- 
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
--config.h: stamp-h
-+config.h: stamp-h1
- 	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) stamp-h1; \
- 	else :; fi
--stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+
-+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+	rm -f stamp-h1
-+	touch $@
- 
--mostlyclean-hdr:
--
--clean-hdr:
--
- distclean-hdr:
--	-rm -f config.h
-+	-rm -f config.h stamp-h1
- 
--maintainer-clean-hdr:
--
--mostlyclean-libLTLIBRARIES:
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--
--distclean-libLTLIBRARIES:
--
--maintainer-clean-libLTLIBRARIES:
--
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
--	  else :; fi; \
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
- 	done
--
--uninstall-libLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--	done
--
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
--
--mostlyclean-compile:
--	-rm -f *.o core *.core
--	-rm -f *.$(OBJEXT)
--
--clean-compile:
--
--distclean-compile:
--	-rm -f *.tab.c
--
--maintainer-clean-compile:
--
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--mostlyclean-libtool:
--	-rm -f *.lo
--
--clean-libtool:
--	-rm -rf .libs _libs
--
--distclean-libtool:
--
--maintainer-clean-libtool:
--
--libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
--
--mostlyclean-binPROGRAMS:
--
--clean-binPROGRAMS:
--	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--
--distclean-binPROGRAMS:
--
--maintainer-clean-binPROGRAMS:
--
-+libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) 
-+	$(LINK)  $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
- 
--mostlyclean-sbinPROGRAMS:
--
--clean-sbinPROGRAMS:
--	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
--
--distclean-sbinPROGRAMS:
--
--maintainer-clean-sbinPROGRAMS:
--
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-sbinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
- 	done
- 
--dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES)
-+clean-sbinPROGRAMS:
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) 
-+	@rm -f dbmail-imapd$(EXEEXT)
-+	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) 
-+	@rm -f dbmail-lmtpd$(EXEEXT)
-+	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) 
-+	@rm -f dbmail-pop3d$(EXEEXT)
-+	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) 
- 	@rm -f dbmail-sievecmd$(EXEEXT)
- 	$(LINK) $(dbmail_sievecmd_LDFLAGS) $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_LDADD) $(LIBS)
--
--dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES)
-+dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) 
-+	@rm -f dbmail-smtp$(EXEEXT)
-+	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) 
- 	@rm -f dbmail-timsieved$(EXEEXT)
- 	$(LINK) $(dbmail_timsieved_LDFLAGS) $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_LDADD) $(LIBS)
-+dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) 
-+	@rm -f dbmail-users$(EXEEXT)
-+	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) 
-+	@rm -f dbmail-util$(EXEEXT)
-+	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
- 
--dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES)
--	@rm -f dbmail-smtp$(EXEEXT)
--	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
- 
--dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES)
--	@rm -f dbmail-pop3d$(EXEEXT)
--	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+distclean-compile:
-+	-rm -f *.tab.c
- 
--dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES)
--	@rm -f dbmail-imapd$(EXEEXT)
--	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmd5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmsgbuf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsearch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dm_getopt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsn.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap4.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapcommands.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaputil.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtpd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maintenance.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblock.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3d.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfcmsg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverchild.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievecmd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieve.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieved.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
- 
--dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES)
--	@rm -f dbmail-util$(EXEEXT)
--	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES)
--	@rm -f dbmail-users$(EXEEXT)
--	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES)
--	@rm -f dbmail-lmtpd$(EXEEXT)
--	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
--
--@SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -463,7 +565,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -471,13 +573,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -487,246 +600,327 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.in $$unique $(LISP))
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
- 
--mostlyclean-tags:
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
--clean-tags:
--
- distclean-tags:
--	-rm -f TAGS ID
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
--maintainer-clean-tags:
--
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
--
--# This target untars the dist file and tries a VPATH configuration.  Then
--# it guarantees that the distribution is self-contained by making another
--# tarfile.
--distcheck: dist
--	-rm -rf $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
--	dc_install_base=`cd $(distdir)/=inst && pwd`; \
--	cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
--	  && $(MAKE) $(AM_MAKEFLAGS) check \
--	  && $(MAKE) $(AM_MAKEFLAGS) install \
--	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist
--	-rm -rf $(distdir)
--	@banner="$(distdir).tar.gz is ready for distribution"; \
--	dashes=`echo "$$banner" | sed s/./=/g`; \
--	echo "$$dashes"; \
--	echo "$$banner"; \
--	echo "$$dashes"
--dist: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
--dist-all: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
- distdir: $(DISTFILES)
--	-rm -rf $(distdir)
-+	$(am__remove_distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	$(mkdir_p) $(distdir)/buildtools
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--	for subdir in $(SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
- 
---include $(DEP_FILES)
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
- 
--mostlyclean-depend:
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
- 
--clean-depend:
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
- 
--distclean-depend:
--	-rm -rf .deps
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-recursive
--dvi-am:
--dvi: dvi-recursive
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--installcheck-am:
--installcheck: installcheck-recursive
--all-recursive-am: config.h
--	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
--		install-sbinPROGRAMS
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
--
--install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
--		uninstall-sbinPROGRAMS
--uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
--all-redirect: all-recursive-am
-+
-+installcheck: installcheck-recursive
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
--		$(DESTDIR)$(sbindir)
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
--		mostlyclean-compile mostlyclean-libtool \
--		mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
--		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
- 
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am
- 
--clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
--		clean-depend clean-generic mostlyclean-am
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-hdr distclean-libtool distclean-tags
- 
--clean: clean-recursive
-+dvi: dvi-recursive
- 
--distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-binPROGRAMS \
--		distclean-sbinPROGRAMS distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-recursive
--	-rm -f config.status
-+html: html-recursive
- 
--maintainer-clean-am:  maintainer-clean-hdr \
--		maintainer-clean-libLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-binPROGRAMS \
--		maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
--		maintainer-clean-depend maintainer-clean-generic \
--		distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
- 
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-recursive
--	-rm -f config.status
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
--clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
--uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
--distclean-compile clean-compile maintainer-clean-compile \
--mostlyclean-libtool distclean-libtool clean-libtool \
--maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
--clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
--install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
--clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
--install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
--install-exec-recursive uninstall-exec-recursive installdirs-recursive \
--uninstalldirs-recursive all-recursive check-recursive \
--installcheck-recursive info-recursive dvi-recursive \
--mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck all-recursive-am install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-recursive
- 
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
- 
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-sbinPROGRAMS
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-recursive clean-sbinPROGRAMS \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-compile distclean-generic distclean-hdr \
-+	distclean-libtool distclean-recursive distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-sbinPROGRAMS \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am uninstall-sbinPROGRAMS
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- man/Makefile.in	(revision 1905)
-+++ man/Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -26,88 +30,116 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = man
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-+man8dir = $(mandir)/man8
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,41 +147,105 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 \
-+	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
- 
--man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
-+all: all-am
- 
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--man1dir = $(mandir)/man1
--man8dir = $(mandir)/man8
--MANS = $(man_MANS)
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  man/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
- 
--NROFF = nroff
--DIST_COMMON =  Makefile.am Makefile.in
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+mostlyclean-libtool:
-+	-rm -f *.lo
- 
--TAR = tar
--GZIP_ENV = --best
--all: all-redirect
--.SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
-+clean-libtool:
-+	-rm -rf .libs _libs
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--install-man1:
--	$(mkinstalldirs) $(DESTDIR)$(man1dir)
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-man1: $(man1_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -158,31 +254,43 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
- uninstall-man1:
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
--install-man8:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir)
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+install-man8: $(man8_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -191,120 +299,161 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--
- uninstall-man8:
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--install-man: $(MANS)
--	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man8
--uninstall-man:
--	@$(NORMAL_UNINSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man8
- tags: TAGS
- TAGS:
- 
-+ctags: CTAGS
-+CTAGS:
- 
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
--subdir = man
--
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
-+all-am: Makefile $(MANS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am: install-man
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-man
--uninstall: uninstall-am
--all-am: Makefile $(MANS)
--all-redirect: all-am
-+
-+installcheck: installcheck-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man8
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool mostlyclean-am
- 
--clean-am:  clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
- 
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man: install-man1 install-man8
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: install-man1 uninstall-man1 install-man8 uninstall-man8 \
--install-man uninstall-man tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-am
- 
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-man
-+
-+uninstall-man: uninstall-man1 uninstall-man8
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-man8 install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-man uninstall-man1 uninstall-man8
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- configure.in	(revision 1905)
-+++ configure.in	(revision 1948)
-@@ -19,7 +19,6 @@
- AC_INIT(main.c)
- AC_CONFIG_AUX_DIR(buildtools)
- AM_CONFIG_HEADER(config.h:config.in)
--DBMAIL_MSG_CONFIGURE_START
- AM_INIT_AUTOMAKE(dbmail, 2.0.7)
- AM_MAINTAINER_MODE
- 
---- ChangeLog	(revision 1905)
-+++ ChangeLog	(revision 1948)
-@@ -1,3 +1,46 @@
-+2005-12-22  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog:
-+	blah
-+	* imapcommands.c, imaputil.c:
-+	resync git tree
-+	* ChangeLog:
-+	Merge with /home/paul/git/dbmail-2.0
-+commit d97cef746efa52603fc423759bfe216b53859321
-+tree 32074d5cac257cf2b30ed48979ca88050441e4c7
-+parent 8c598295ff66c378785b2187f6923c99b5df2a6f
-+author Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+committer Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+	* ChangeLog:
-+	blah
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	update mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/po/es.po:
-+	adding spanish translation of debconf files
-+	* INSTALL, INSTALL.dbmail, Makefile.in, acinclude.m4, aclocal.m4, 
-+	  auth/Makefile.in, buildtools/install-sh, buildtools/ltmain.sh, 
-+	  buildtools/missing, buildtools/mkinstalldirs, configure, 
-+	  configure.in, debian/control, debian/rules, man/Makefile.in, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	cleanup autotools chain a bit
-+	* main.c:
-+	remove redeclaration of global dsnuser (closes: #281)
-+	* INSTALL, Makefile.in, auth/Makefile.in, buildtools/depcomp, debian/rules, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	updated autotools for autoconf-1.9
-+
-+2005-10-26  Paul J Stevens <paul@nfg.nl>
-+
-+	* dsn.c, main.c, server.c, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	resync tree
-+	* imapcommands.c, imaputil.c:
-+	initialize struct tm values before calling strptime (closes: #277)
-+
- 2005-10-18  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, auth/authsql.c, dsn.c, main.c:
---- buildtools/depcomp	(revision 0)
-+++ buildtools/depcomp	(revision 1948)
-@@ -0,0 +1,530 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-
---- buildtools/missing	(revision 1905)
-+++ buildtools/missing	(revision 1948)
-@@ -1,8 +1,12 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
--# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
- 
-+scriptversion=2005-06-08.21
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
-@@ -15,15 +19,47 @@
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- 
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
- if test $# -eq 0; then
-   echo 1>&2 "Try \`$0 --help' for more information"
-   exit 1
- fi
- 
-+run=:
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
- case "$1" in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -35,6 +71,7 @@
- Options:
-   -h, --help      display this help and exit
-   -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
- 
- Supported PROGRAM values:
-   aclocal      touch file \`aclocal.m4'
-@@ -43,13 +80,19 @@
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-   lex          create \`lex.yy.c', if possible, from existing .c
-   makeinfo     touch the output file
--  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
-     ;;
- 
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--    echo "missing - GNU libit 0.0"
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -58,10 +101,45 @@
-     exit 1
-     ;;
- 
--  aclocal)
-+esac
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+  lex|yacc)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+  aclocal*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-          to install the \`Automake' and \`Perl' packages.  Grab them from
-          any GNU archive site."
-     touch aclocal.m4
-@@ -69,8 +147,8 @@
- 
-   autoconf)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`configure.in'.  You might want to install the
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-          archive site."
-     touch configure
-@@ -78,11 +156,11 @@
- 
-   autoheader)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acconfig.h' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-          from any GNU archive site."
--    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
-@@ -95,10 +173,10 @@
-     touch $touch_files
-     ;;
- 
--  automake)
-+  automake*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-          You might want to install the \`Automake' and \`Perl' packages.
-          Grab them from any GNU archive site."
-     find . -type f -name Makefile.am -print |
-@@ -106,9 +184,32 @@
- 	   while read f; do touch "$f"; done
-     ;;
- 
-+  autom4te)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-   bison|yacc)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-@@ -138,7 +239,7 @@
- 
-   lex|flex)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-@@ -159,28 +260,90 @@
-     fi
-     ;;
- 
-+  help2man)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+    fi
-+    if [ -f "$file" ]; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit 1
-+    fi
-+    ;;
-+
-   makeinfo)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-          indirectly affecting the aspect of the manual.  The spurious
-          call might also be the consequence of using a buggy \`make' (AIX,
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-     if test -z "$file"; then
--      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
-+  tar)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case "$firstarg" in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case "$firstarg" in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-   *)
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-@@ -188,3 +351,10 @@
- esac
- 
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/install-sh	(revision 1905)
-+++ buildtools/install-sh	(revision 1948)
-@@ -1,20 +1,39 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-05-14.22
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# Copyright (C) 1994 X Consortium
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
- #
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
- # when there is no Makefile.
-@@ -23,13 +42,11 @@
- # from scratch.  It can only install one file at a time, a restriction
- # shared with many OS's install programs.
- 
--
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
- 
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
- 
- mvprog="${MVPROG-mv}"
-@@ -41,211 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
- 
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd="$cpprog"
--	    shift
--	    continue;;
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--	-d) dir_arg=true
--	    shift
--	    continue;;
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
- 
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
- 
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
- 
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
- 
--	-s) stripcmd="$stripprog"
--	    shift
--	    continue;;
-+    -d) dir_arg=true
-+        shift
-+        continue;;
- 
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
-+    --help) echo "$usage"; exit $?;;
- 
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$src" = x ]
--then
--	echo "install:	no input file specified"
--	exit 1
--else
--	true
--fi
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--	
--	if [ -d $dst ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=mkdir
--	fi
--else
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad 
--# if $src (and thus $dsttmp) contains '*'.
-+    -t) dstarg=$2
-+	shift
-+	shift
-+	continue;;
- 
--	if [ -f $src -o -d $src ]
--	then
--		true
--	else
--		echo "install:  $src does not exist"
--		exit 1
--	fi
--	
--	if [ x"$dst" = x ]
--	then
--		echo "install:	no destination specified"
--		exit 1
--	else
--		true
--	fi
-+    -T) no_target_directory=true
-+	shift
-+	continue;;
- 
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	if [ -d $dst ]
--	then
--		dst="$dst"/`basename $src`
--	else
--		true
--	fi
-+    *)  # When -d is used, all remaining arguments are directories to create.
-+	# When -t is used, the destination is already specified.
-+	test -n "$dir_arg$dstarg" && break
-+        # Otherwise, the last argument is the destination.  Remove it from $@.
-+	for arg
-+	do
-+          if test -n "$dstarg"; then
-+	    # $@ is not empty: it contains at least $arg.
-+	    set fnord "$@" "$dstarg"
-+	    shift # fnord
-+	  fi
-+	  shift # arg
-+	  dstarg=$arg
-+	done
-+	break;;
-+  esac
-+done
-+
-+if test -z "$1"; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
- fi
- 
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src ;;
-+  esac
- 
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    src=
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='	
--'
--IFS="${IFS-${defaultIFS}}"
-+    if test -d "$dst"; then
-+      mkdircmd=:
-+      chmodcmd=
-+    else
-+      mkdircmd=$mkdirprog
-+    fi
-+  else
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
- 
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+    if test -z "$dstarg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
- 
--pathcomp=''
-+    dst=$dstarg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst ;;
-+    esac
- 
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
--	shift
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dstarg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dst=$dst/`basename "$src"`
-+    fi
-+  fi
- 
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
-+  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- 
--	pathcomp="${pathcomp}/"
--done
--fi
-+  # Make sure that the destination directory exists.
- 
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
-+  # Skip lots of stat calls in the usual case.
-+  if test ! -d "$dstdir"; then
-+    defaultIFS='
-+	 '
-+    IFS="${IFS-$defaultIFS}"
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
-+    oIFS=$IFS
-+    # Some sh's can't handle IFS=/ for some reason.
-+    IFS='%'
-+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+    shift
-+    IFS=$oIFS
- 
--# If we're going to rename the final executable, determine the name now.
-+    pathcomp=
- 
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
-+    while test $# -ne 0 ; do
-+      pathcomp=$pathcomp$1
-+      shift
-+      if test ! -d "$pathcomp"; then
-+        $mkdirprog "$pathcomp"
-+	# mkdir can fail with a `File exist' error in case several
-+	# install-sh are creating the directory concurrently.  This
-+	# is OK.
-+	test -d "$pathcomp" || exit
-+      fi
-+      pathcomp=$pathcomp/
-+    done
-+  fi
- 
--# don't allow the sed command to completely eliminate the filename
-+  if test -n "$dir_arg"; then
-+    $doit $mkdircmd "$dst" \
-+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
- 
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
-+  else
-+    dstfile=`basename "$dst"`
- 
--# Make a temp file name in the proper directory.
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
- 
--	dsttmp=$dstdir/#inst.$$#
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+    trap '(exit $?); exit' 1 2 13 15
- 
--# Move or copy the file name to the temp name
-+    # Copy the file name to the temp name.
-+    $doit $cpprog "$src" "$dsttmp" &&
- 
--	$doit $instcmd $src $dsttmp &&
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+    # Now rename the file to the real destination.
-+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+      || {
-+	   # The rename failed, perhaps because mv can't rename something else
-+	   # to itself, or perhaps because mv is so ancient that it does not
-+	   # support -f.
- 
--# and set any options; do chmod last to preserve setuid bits
-+	   # Now remove or move aside any old file at destination location.
-+	   # We try this two ways since rm can't unlink itself on some
-+	   # systems and the destination file might be busy for other
-+	   # reasons.  In this case, the final cleanup might fail but the new
-+	   # file should still install successfully.
-+	   {
-+	     if test -f "$dstdir/$dstfile"; then
-+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+	       || {
-+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		 (exit 1); exit 1
-+	       }
-+	     else
-+	       :
-+	     fi
-+	   } &&
- 
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
-+	   # Now rename the file to the real destination.
-+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	 }
-+    }
-+  fi || { (exit 1); exit 1; }
-+done
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+  (exit 0); exit 0
-+}
- 
--# Now rename the file to the real destination.
--
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
--
--fi &&
--
--
--exit 0
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- configure	(revision 1905)
-+++ configure	(revision 1948)
-@@ -278,15 +278,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -463,7 +463,7 @@
- # 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
-+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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1023,8 +1023,10 @@
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-shared[=PKGS]
-                           build shared libraries [default=yes]
-   --enable-static[=PKGS]
-@@ -1526,22 +1528,9 @@
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
--
-           ac_config_headers="$ac_config_headers config.h:config.in"
- 
--          ac_config_commands="$ac_config_commands default-1"
--
--echo "$as_me:$LINENO: result:
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&5
--echo "${ECHO_T}
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&6
--
-+am__api_version="1.9"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -1625,20 +1614,21 @@
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
--echo timestamp > conftestfile
-+echo timestamp > conftest.file
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
--   if test "$*" != "X $srcdir/configure conftestfile" \
--      && test "$*" != "X conftestfile $srcdir/configure"; then
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-       # If neither matched, then we have a broken ls.  This can happen
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-@@ -1651,7 +1641,7 @@
-    { (exit 1); exit 1; }; }
-    fi
- 
--   test "$2" = conftestfile
-+   test "$2" = conftest.file
-    )
- then
-    # Ok.
-@@ -1663,7 +1653,6 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-@@ -1679,6 +1668,92 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$AWK" && break
-+done
-+
- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-@@ -1708,17 +1783,38 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
- 
--PACKAGE=dbmail
--
--VERSION=2.0.7
--
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=dbmail
-+ VERSION=2.0.7
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
- _ACEOF
-@@ -1728,85 +1824,124 @@
- #define VERSION "$VERSION"
- _ACEOF
- 
-+# Some tools Automake needs.
- 
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
- 
--missing_dir=`cd $ac_aux_dir && pwd`
--echo "$as_me:$LINENO: checking for working aclocal" >&5
--echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
- fi
--
--echo "$as_me:$LINENO: checking for working autoconf" >&5
--echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working automake" >&5
--echo $ECHO_N "checking for working automake... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   AUTOMAKE="$missing_dir/missing automake"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
--
--echo "$as_me:$LINENO: checking for working autoheader" >&5
--echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
- else
--   AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working makeinfo" >&5
--echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
--   MAKEINFO=makeinfo
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+  STRIP=$ac_ct_STRIP
- else
--   MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  STRIP="$ac_cv_prog_STRIP"
- fi
- 
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
- 
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
- echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-@@ -1827,6 +1962,7 @@
-   MAINTAINER_MODE_TRUE='#'
-   MAINTAINER_MODE_FALSE=
- fi
-+
-   MAINT=$MAINTAINER_MODE_TRUE
- 
- 
-@@ -2109,6 +2245,71 @@
- echo "${ECHO_T}using SQL authentication" >&6
- fi
- 
-+DEPDIR="${am__leading_dot}deps"
-+
-+          ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+  enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3033,7 +3234,116 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
- 
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
-@@ -5472,6 +5782,115 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
- echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6
- if test -n "$CXX"
-@@ -5684,6 +6103,7 @@
- fi
- 
- 
-+
- if test -n "$MYSQLINC"; then
-   MYSQL_TRUE=
-   MYSQL_FALSE='#'
-@@ -5693,6 +6113,7 @@
- fi
- 
- 
-+
- if test -n "$PGSQLINC"; then
-   PGSQL_TRUE=
-   PGSQL_FALSE='#'
-@@ -5702,6 +6123,7 @@
- fi
- 
- 
-+
- if test -n "$SIEVEINC"; then
-   SIEVE_TRUE=
-   SIEVE_FALSE='#'
-@@ -5711,6 +6133,7 @@
- fi
- 
- 
-+
- if test -n "$LDAPINC"; then
-   LDAP_TRUE=
-   LDAP_FALSE='#'
-@@ -5718,6 +6141,7 @@
-   LDAP_TRUE='#'
-   LDAP_FALSE=
- fi
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-@@ -6409,7 +6833,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6434,10 +6858,10 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- 
- fi
- 
-+SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -6499,7 +6923,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -6533,7 +6957,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -6563,6 +6987,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- 
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -6649,7 +7082,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -6672,13 +7105,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -6694,7 +7127,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -6744,12 +7177,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -6841,7 +7272,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6844 "configure"' > conftest.$ac_ext
-+  echo '#line 7275 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6884,7 +7315,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -7502,7 +7933,121 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--ac_ext=cc
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7732,7 +8277,9 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+fi
- 
-+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7825,7 +8372,7 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:7828:" \
-+echo "$as_me:8375:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8013,11 +8560,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -8063,9 +8637,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -8087,6 +8658,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDGIRSTW]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
-@@ -8118,8 +8696,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -8281,7 +8862,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
-@@ -8301,7 +8882,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8586,6 +9167,17 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -8611,7 +9203,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8673,7 +9265,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8772,6 +9364,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8808,11 +9414,16 @@
-    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works=yes
-+       fi
-      else
-        lt_prog_compiler_static_works=yes
-      fi
-@@ -8854,18 +9465,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8860: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8864: \$? = $ac_status" >&5
-+   echo "$as_me:9475: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -8942,7 +9555,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -8968,6 +9581,16 @@
- 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic='-qnocommon'
-+         lt_prog_compiler_wl='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -8979,7 +9602,7 @@
-       lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9003,12 +9626,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-@@ -9029,9 +9659,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -9053,6 +9688,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic='-pic'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9087,18 +9727,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9097: \$? = $ac_status" >&5
-+   echo "$as_me:9737: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works=yes
-      fi
-    fi
-@@ -9119,7 +9761,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic=
-@@ -9147,23 +9789,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9153: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9795: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9157: \$? = $ac_status" >&5
-+   echo "$as_me:9799: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -9239,6 +9883,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -9259,6 +9913,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -9309,7 +9984,7 @@
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -9327,6 +10002,38 @@
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -9365,32 +10072,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds="$tmp_archive_cmds"
--      fi
--      link_all_deplibs=no
--    else
--      ld_shlibs=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -9401,16 +10082,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9474,7 +10150,7 @@
-       link_all_deplibs=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9495,6 +10171,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9639,7 +10318,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec=' '
- 	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -9653,7 +10332,7 @@
-       ld_shlibs=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
-@@ -9679,52 +10358,52 @@
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
-+      whole_archive_flag_spec=''
-       link_all_deplibs=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -9758,7 +10437,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -9783,7 +10462,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -9792,7 +10471,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -9802,7 +10481,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9869,6 +10548,7 @@
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec='${wl}-E'
-       else
-@@ -9914,7 +10594,7 @@
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9933,10 +10613,12 @@
-     solaris*)
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -9945,8 +10627,18 @@
-       hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs=yes
-       ;;
-@@ -10220,7 +10912,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10248,7 +10940,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -10278,7 +10971,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -10301,7 +10994,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10336,8 +11029,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10355,7 +11057,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -10382,7 +11084,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -10481,7 +11183,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -10556,7 +11258,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -10678,8 +11384,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
-+   test -n "$runpath_var" || \
-+   test "X$hardcode_automatic" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct" != no &&
-@@ -11338,7 +12044,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11341 "configure"
-+#line 12047 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11404,7 +12110,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11436,7 +12142,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11439 "configure"
-+#line 12145 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11502,7 +12208,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11552,7 +12258,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -11565,43 +12271,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
-     ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11731,7 +12400,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -11742,11 +12411,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -11776,7 +12445,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -11852,7 +12527,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -12147,7 +12822,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12184,7 +12861,7 @@
- compiler_lib_search_path_CXX=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -12205,6 +12882,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -12226,8 +12917,17 @@
- CC=${CXX-"c++"}
- compiler=$CC
- compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
-@@ -12297,7 +12997,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -12331,7 +13031,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -12440,7 +13140,7 @@
-     link_all_deplibs_CXX=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.012|aix4.012.*)
-+      case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12461,6 +13161,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -12606,7 +13309,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	whole_archive_flag_spec_CXX=' '
- 	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -12620,6 +13323,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -12643,65 +13347,76 @@
-       ld_shlibs_CXX=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_CXX='-undefined dynamic_lookup'
--            ;;
--        esac
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        ;;
- 
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--  else
--    ld_shlibs_CXX=no
--  fi
--    ;;
--
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -12712,14 +13427,14 @@
- 	;;
-     esac
-     ;;
--  freebsd12*)
-+  freebsd[12]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -12736,11 +13451,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
--    aCC)
-+    aCC*)
-       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -12750,7 +13465,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -12764,7 +13479,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12780,7 +13495,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       hardcode_direct_CXX=no
-       hardcode_shlibpath_var_CXX=no
-@@ -12801,12 +13516,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -12827,7 +13542,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -12845,9 +13560,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12858,7 +13573,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -12871,7 +13586,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12896,17 +13611,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -12937,7 +13676,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -12958,9 +13697,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    ld_shlibs_CXX=no
-+    ;;
-+  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12976,14 +13731,14 @@
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13001,7 +13756,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13020,7 +13775,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -13035,17 +13790,17 @@
- 	# the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13064,7 +13819,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13088,7 +13843,7 @@
-   sco*)
-     archive_cmds_need_lc_CXX=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13100,12 +13855,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13118,36 +13873,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        archive_cmds_need_lc_CXX=yes
- 	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
- 	case $host_os in
--	  solaris2.0-5 | solaris2.0-5.*) ;;
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	link_all_deplibs_CXX=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13155,7 +13907,7 @@
- 	# in the archive.
- 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -13198,7 +13950,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13251,7 +14003,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -13327,6 +14079,20 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+
-+
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13382,7 +14148,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -13407,18 +14173,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13426,22 +14202,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      lt_prog_compiler_pic_CXX='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -13456,7 +14232,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -13467,18 +14243,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13495,7 +14277,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    lt_prog_compiler_pic_CXX='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -13506,14 +14288,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13529,7 +14311,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  *)
-@@ -13538,13 +14320,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    lt_prog_compiler_wl_CXX='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-PIC'
- 	    ;;
-@@ -13554,12 +14336,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13569,7 +14351,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
-@@ -13610,18 +14392,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:13620: \$? = $ac_status" >&5
-+   echo "$as_me:14402: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-@@ -13642,7 +14426,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_CXX=
-@@ -13670,23 +14454,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:13680: \$? = $ac_status" >&5
-+   echo "$as_me:14464: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -13741,7 +14527,7 @@
-     export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     link_all_deplibs_CXX=no
-@@ -13924,7 +14710,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13952,7 +14738,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -13982,7 +14769,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -14005,7 +14792,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14040,8 +14827,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14059,7 +14855,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -14086,7 +14882,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -14185,7 +14981,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -14260,7 +15056,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -14382,8 +15182,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_CXX" != no &&
-@@ -15042,7 +15842,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15045 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15108,7 +15908,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15140,7 +15940,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15143 "configure"
-+#line 15943 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15206,7 +16006,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15358,7 +16158,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -15434,7 +16240,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -15715,13 +16521,36 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -15733,7 +16562,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -15742,7 +16571,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15819,7 +16650,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15845,6 +16676,16 @@
- 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_F77='-qnocommon'
-+         lt_prog_compiler_wl_F77='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -15856,7 +16697,7 @@
-       lt_prog_compiler_wl_F77='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15880,12 +16721,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_F77='-Wl,'
-+	lt_prog_compiler_pic_F77='-fpic'
-+	lt_prog_compiler_static_F77='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-@@ -15906,9 +16754,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_F77='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_F77='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -15930,6 +16783,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -15964,18 +16822,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15970: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15974: \$? = $ac_status" >&5
-+   echo "$as_me:16832: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-@@ -15996,7 +16856,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_F77=
-@@ -16024,23 +16884,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16034: \$? = $ac_status" >&5
-+   echo "$as_me:16894: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_F77=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -16116,6 +16978,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -16136,6 +17008,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_F77=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -16186,7 +17079,7 @@
-       allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=no
-       enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -16200,10 +17093,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_F77=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_F77=no
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16242,32 +17167,6 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_F77="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_F77="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_F77=no
--    else
--      ld_shlibs_F77=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16278,16 +17177,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
-+    if test "$ld_shlibs_F77" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_F77=
-+      export_dynamic_flag_spec_F77=
-+      whole_archive_flag_spec_F77=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16351,7 +17245,7 @@
-       link_all_deplibs_F77=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16372,6 +17266,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -16496,7 +17393,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_F77=' '
- 	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -16510,7 +17407,7 @@
-       ld_shlibs_F77=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
- 
-@@ -16531,57 +17428,57 @@
-       old_archive_From_new_cmds_F77='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_F77=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_F77='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
-+      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_F77=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_F77=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -16615,7 +17512,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -16640,7 +17537,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -16649,7 +17546,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -16659,7 +17556,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16726,6 +17623,7 @@
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_F77='${wl}-E'
-       else
-@@ -16771,7 +17669,7 @@
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16790,10 +17688,12 @@
-     solaris*)
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16802,8 +17702,18 @@
-       hardcode_shlibpath_var_F77=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_F77=yes
-       ;;
-@@ -17077,7 +17987,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17105,7 +18015,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -17135,7 +18046,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17158,7 +18069,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17193,8 +18104,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17212,7 +18132,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -17239,7 +18159,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -17338,7 +18258,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -17413,7 +18333,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -17535,8 +18459,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
-+   test -n "$runpath_var_F77" || \
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_F77" != no &&
-@@ -17713,7 +18637,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -17789,7 +18719,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -18027,7 +18957,7 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
-@@ -18038,16 +18968,42 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- compiler_GCJ=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- archive_cmds_need_lc_GCJ=no
- 
-+old_archive_cmds_GCJ=$old_archive_cmds
- 
-+
- lt_prog_compiler_no_builtin_flag_GCJ=
- 
- if test "$GCC" = yes; then
-@@ -18069,18 +19025,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18075: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19031: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18079: \$? = $ac_status" >&5
-+   echo "$as_me:19035: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -18157,7 +19115,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18183,6 +19141,16 @@
- 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18194,7 +19162,7 @@
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18218,12 +19186,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-fpic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-@@ -18244,9 +19219,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_GCJ='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -18268,6 +19248,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_GCJ='-pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18302,18 +19287,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19293: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18312: \$? = $ac_status" >&5
-+   echo "$as_me:19297: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-@@ -18334,7 +19321,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_GCJ=
-@@ -18362,23 +19349,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18368: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19355: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18372: \$? = $ac_status" >&5
-+   echo "$as_me:19359: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_GCJ=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -18454,6 +19443,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -18474,6 +19473,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -18524,7 +19544,7 @@
-       allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=no
-       enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -18538,10 +19558,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_GCJ=no
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18580,32 +19632,6 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_GCJ="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_GCJ=no
--    else
--      ld_shlibs_GCJ=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18616,16 +19642,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_GCJ" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--      fi
-+    if test "$ld_shlibs_GCJ" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_GCJ=
-+      export_dynamic_flag_spec_GCJ=
-+      whole_archive_flag_spec_GCJ=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18689,7 +19710,7 @@
-       link_all_deplibs_GCJ=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18710,6 +19731,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -18854,7 +19878,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_GCJ=' '
- 	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -18868,7 +19892,7 @@
-       ld_shlibs_GCJ=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
- 
-@@ -18889,57 +19913,57 @@
-       old_archive_From_new_cmds_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_GCJ=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_GCJ=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_GCJ=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_GCJ=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -18973,7 +19997,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -18998,7 +20022,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -19007,7 +20031,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -19017,7 +20041,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19084,6 +20108,7 @@
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-@@ -19129,7 +20154,7 @@
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19148,10 +20173,12 @@
-     solaris*)
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19160,8 +20187,18 @@
-       hardcode_shlibpath_var_GCJ=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_GCJ=yes
-       ;;
-@@ -19435,7 +20472,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19463,7 +20500,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -19493,7 +20531,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -19516,7 +20554,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19551,8 +20589,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19570,7 +20617,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -19597,7 +20644,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -19696,7 +20743,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -19771,7 +20818,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -19893,8 +20944,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var GCJ" || \
--   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-+   test -n "$runpath_var_GCJ" || \
-+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_GCJ" != no &&
-@@ -20553,7 +21604,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20556 "configure"
-+#line 21607 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20619,7 +21670,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20651,7 +21702,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20654 "configure"
-+#line 21705 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20717,7 +21768,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20869,7 +21920,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -20945,7 +22002,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21193,11 +22250,35 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- compiler_RC=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
- lt_cv_prog_compiler_c_o_RC=yes
- 
- # The else clause should only fire when bootstrapping the
-@@ -21314,7 +22395,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -21390,7 +22477,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21758,6 +22845,76 @@
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${USE_DM_GETOPT_TRUE}" && test -z "${USE_DM_GETOPT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${MYSQL_TRUE}" && test -z "${MYSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${PGSQL_TRUE}" && test -z "${PGSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${SIEVE_TRUE}" && test -z "${SIEVE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -22191,8 +23348,8 @@
- # INIT-COMMANDS section.
- #
- 
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--
- _ACEOF
- 
- 
-@@ -22208,7 +23365,7 @@
-   "auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES auth/Makefile" ;;
-   "sort/Makefile" ) CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;;
-   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -22298,6 +23455,7 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -22305,7 +23463,17 @@
- s,@AUTOMAKE@,$AUTOMAKE,;t t
- s,@AUTOHEADER@,$AUTOHEADER,;t t
- s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@mkdir_p@,$mkdir_p,;t t
-+s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@am__tar@,$am__tar,;t t
-+s,@am__untar@,$am__untar,;t t
- s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
- s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
- s,@MAINT@,$MAINT,;t t
-@@ -22318,6 +23486,15 @@
- s,@ac_ct_CC@,$ac_ct_CC,;t t
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
-@@ -22359,11 +23536,12 @@
- s,@ac_ct_AR@,$ac_ct_AR,;t t
- s,@RANLIB@,$RANLIB,;t t
- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
- s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@F77@,$F77,;t t
- s,@FFLAGS@,$FFLAGS,;t t
-@@ -22830,7 +24008,29 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
- done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
-+	 X$ac_file : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- 
-@@ -22946,7 +24146,91 @@
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
- echo "$as_me: executing $ac_dest commands" >&6;}
-   case $ac_dest in
--    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
-+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    { if $as_mkdir_p; then
-+    mkdir -p $dirpart/$fdir
-+  else
-+    as_dir=$dirpart/$fdir
-+    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 $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
-   esac
- done
- _ACEOF
---- INSTALL.dbmail	(revision 0)
-+++ INSTALL.dbmail	(revision 1948)
-@@ -0,0 +1,210 @@
-+/* $Id: INSTALL 1606 2005-02-23 15:46:03Z paul $ 
-+   (c) 2000-2002 IC&S, The Netherlands */
-+
-+DBMAIL installation
-+===================
-+
-+This file describes the installation of DBMail. To read about extra 
-+features in dbmail you should consult the EXTRAS file.
-+Remember, DBmail is easy to install, as long as you exactly follow
-+these instructions.
-+
-+What do you need?
-+
-+- a working mysql (> 4.0.14) or postgresql installation
-+- a working smtp server (Postfix, Exim, QMail or Sendmail)
-+- the DBMail source (www.dbmail.org)
-+- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
-+  *BSD systems, make sure you install and use 'gmake'. 
-+- development files (libs, scripts and include files) for your database
-+  server. These will probably be provided by separate packages.
-+    
-+
-+1.	Setup a database
-+
-+	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
-+	MySQL is supported from version 4.0.14 upwards. Earlier versions of
-+	MySQL lack some SQL features that are needed for DBMail, like support
-+	for the INSERT...SELECT statement.
-+
-+	Mysql setup
-+	-----------
-+
-+	Note: Since some DBMail tables can get VERY large (depending on your
-+	mailusage) we advise using InnoDB as database storage backend.
-+	
-+	First you'll need to create the DBMail database in MYSQL. You can
-+	do this by issueing the following command. This step is only
-+	necessary when you do not have a database for DBMail yet. Note that
-+	you will be prompted for the MySQL root password.
-+
-+	mysqladmin create dbmail -u root -p
-+
-+	This creates a database with the name "dbmail". Now you have to give
-+	a non-root user access to this database. Start the MySQL command-line
-+	client as root:
-+
-+	mysql -u root -p 
-+
-+	and enter the following command:
-+
-+	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+
-+	Where <pass> should be replaced with the password you want for
-+	the dbmail user. After this step, the database is ready to be
-+	used by the dbmail user. The next step is the creation of the
-+	database tables used by DBMail. Log out of the MySQL client and run 
-+	the following command from the command line. You will have to
-+	enter the password you set in the previous step.
-+
-+	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+
-+	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
-+	create_tables.mysql. This is not recommended though. In future
-+	versions, DBMail will only support MySQL with transaction support,
-+	which is only given by InnoDB at the moment.
-+	
-+	After this, the DBMAIL tables will have been created and we can go
-+	on to the compilation and installation of DBMail itself.
-+
-+	Postgresql setup
-+	----------------
-+	
-+	First you need to create the postgresql user dbmail is going to use.
-+	This is done by. Note that this command can only be performed by
-+	user postgres or another PostgreSQL user with the privileges to
-+	create users and and databases.
-+
-+	createuser -U postgres dbmail
-+
-+	Off course you can use an other username than dbmail, simply replace
-+	it. You can set a password for the user by doing a:
-+
-+	ALTER USER dbmail WITH PASSWORD '<password>';
-+
-+	In a postgresql console, with <password> replaced by the actual 
-+	password you want to use. After doing this you should create the
-+	database for dbmail:
-+
-+	createdb -U dbmail dbmail
-+
-+	The first dbmail is the user you just created, the second the name of
-+	the database.  Of course you can use an other databasename. After
-+	setting up the user and database it's time to create the tables, do a:
-+
-+	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+
-+	Don't forget to start postgresql with the -i option, so it accepts
-+	TCP/IP connections.
-+
-+2. 	Set the database settings
-+
-+	Copy the dbmail.conf file to /etc
-+	Edit the dbmail.conf file and set everything in there
-+	to your likeings.
-+
-+	Make sure to set your database name, user and host are configured
-+	in dbmail.conf. Other options in the configuration file are 
-+	documented there.
-+
-+3.	Run configure & make
-+	Run the configure script. This script uses pg_config or mysql_config
-+	(depending on --with-mysql or --with-pgsql) to detect where the
-+	libraries and include files for these databases are.
-+
-+	e.g. when working with PostgreSQL, this is the configure command:
-+
-+	./configure --with-pgsql
-+
-+	After running configure, 'make all' will build the executables.
-+	
-+	Running 'make install' will install the executables in /usr/local/sbin
-+
-+4.	Create users in the dbmail system
-+
-+	Next you will need to create some users into the dbmail mailing sytem.
-+	Currently this can be done in two ways. One way is using the
-+	dbmail-users utility. The other way is doing it in the database
-+	itself. To do it using the dbmail-users utility and do the following:
-+
-+	dbmail-users -a <username> -w <password> -g <clientid>\
-+	             -m <maxmail> [-s aliases]
-+	
-+	clientid can be left 0 (this is if you want certain mailadministrators
-+	administer specific groups of mailusers). maxmail is the maximum
-+	number of bytes this user may have in his/her mailboxes. 0 is
-+	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
-+	number of aliases for this user. @domain are domain aliases. 
-+	A user always needs to have at least one alias to receive mail, unless
-+	the users username is something like foo@bar.org, where bar.org is 
-+	a domain the mailserver deliveres to.
-+	
-+	example: 
-+	./dbmail-users -a john -w secret -g 0 -m 25M\
-+	               -s john@dude.org john@dude.net @net.com
-+	
-+	This will create a user john, with a password secret. It will set
-+	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
-+	and @net.com will be sent to john. The @net.com is a fallback alias.
-+	This means that all mail that cannot be delivered to an existing alias
-+	for a @net.com address will sent to john.
-+
-+5.	Configure your MTA 
-+
-+	There are two ways to connect your MTA to DBMail. The MTA can start a
-+	dbmail-smtp process and pipe SMTP commands and messages to it, or it
-+	can use lmtp (Local Mail Transport Protocol) to deliver via
-+	dbmail-lmtpd. LMTP is the preferred solution because it offers more
-+	robust error handling and because it is a daemon, high traffic servers
-+	will have reduced delays which would be incurred starting up a
-+	dbmail-smtp process for each message.
-+
-+	The specifics of delivering to DBMail from your MTA can be found in
-+	the INSTALL.<MTA Name> files. Currently there is documentation for
-+	Postfix and Exim.
-+
-+	If you use a different kind of mta that we do not have documentation
-+	for: The dbmail injector program, dbmail-smtp, can receive information
-+	in two ways. Either through raw mail (for example, delivered by
-+	procmail) using the -n option or from a MTA with recipients in the
-+	commandline using the -d option. Be carefull, the -n option is not
-+	fully tested and may behave unexected. If possible use the -d option.
-+
-+	Setup for LMTP should be straightforward if your MTA supports it.
-+
-+6.	Setting up the maintenance run
-+
-+	The dbmail daemons and the smtp injector itself will never actually
-+	delete mail from the database. The only program that will do this is
-+	the dbmail-util program. This program will also check the
-+	integrity of the dbmail database and, if nescessary, fix it. The
-+	dbmail-util program will first delete all messages that are set
-+	for final deletion. After that it will set all messages that have the
-+	delete status set to status final deletion. This way dbmail always
-+	has a backup based upon the interval difference between maintenance
-+	jobs. We recommend running the dbmail-util program in a daily
-+	interval from cron:
-+
-+	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
-+	
-+7.	Starting the servers
-+
-+	If you want users to be able to retrieve email via IMAP or POP3, run
-+	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
-+	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+
-+8.	Problems
-+	--------
-+	For problems you can subscribe to the dbmail mailinglist: 
-+	http://mailman.fastxs.nl/mailman/listinfo/dbmail
-+	
-+	Please always check the archives first.
-+
-+	or check out the dbmail website at http://www.dbmail.org.
-+
-+	Please note that DBMail logs a lot of relevant data to the maillog
-+	(often located at /var/log/maillog or /var/log/mail.log). This can
-+	help you often if something is not working, e.g. if there's no
-+	connection to the database.  
-+
-+
---- INSTALL	(revision 1905)
-+++ INSTALL	(revision 1948)
-@@ -1,210 +1,236 @@
--/* $Id$ 
--   (c) 2000-2002 IC&S, The Netherlands */
-+Installation Instructions
-+*************************
- 
--DBMAIL installation
--===================
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-+Software Foundation, Inc.
- 
--This file describes the installation of DBMail. To read about extra 
--features in dbmail you should consult the EXTRAS file.
--Remember, DBmail is easy to install, as long as you exactly follow
--these instructions.
-+This file is free documentation; the Free Software Foundation gives
-+unlimited permission to copy, distribute and modify it.
- 
--What do you need?
-+Basic Installation
-+==================
- 
--- a working mysql (> 4.0.14) or postgresql installation
--- a working smtp server (Postfix, Exim, QMail or Sendmail)
--- the DBMail source (www.dbmail.org)
--- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
--  *BSD systems, make sure you install and use 'gmake'. 
--- development files (libs, scripts and include files) for your database
--  server. These will probably be provided by separate packages.
--    
-+These are generic installation instructions.
- 
--1.	Setup a database
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
- 
--	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
--	MySQL is supported from version 4.0.14 upwards. Earlier versions of
--	MySQL lack some SQL features that are needed for DBMail, like support
--	for the INSERT...SELECT statement.
-+   It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring.  (Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.)
- 
--	Mysql setup
--	-----------
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
- 
--	Note: Since some DBMail tables can get VERY large (depending on your
--	mailusage) we advise using InnoDB as database storage backend.
--	
--	First you'll need to create the DBMail database in MYSQL. You can
--	do this by issueing the following command. This step is only
--	necessary when you do not have a database for DBMail yet. Note that
--	you will be prompted for the MySQL root password.
-+   The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'.  You only need
-+`configure.ac' if you want to change it or regenerate `configure' using
-+a newer version of `autoconf'.
- 
--	mysqladmin create dbmail -u root -p
-+The simplest way to compile this package is:
- 
--	This creates a database with the name "dbmail". Now you have to give
--	a non-root user access to this database. Start the MySQL command-line
--	client as root:
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
- 
--	mysql -u root -p 
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
- 
--	and enter the following command:
-+  2. Type `make' to compile the package.
- 
--	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
- 
--	Where <pass> should be replaced with the password you want for
--	the dbmail user. After this step, the database is ready to be
--	used by the dbmail user. The next step is the creation of the
--	database tables used by DBMail. Log out of the MySQL client and run 
--	the following command from the command line. You will have to
--	enter the password you set in the previous step.
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
- 
--	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
- 
--	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
--	create_tables.mysql. This is not recommended though. In future
--	versions, DBMail will only support MySQL with transaction support,
--	which is only given by InnoDB at the moment.
--	
--	After this, the DBMAIL tables will have been created and we can go
--	on to the compilation and installation of DBMail itself.
-+Compilers and Options
-+=====================
- 
--	Postgresql setup
--	----------------
--	
--	First you need to create the postgresql user dbmail is going to use.
--	This is done by. Note that this command can only be performed by
--	user postgres or another PostgreSQL user with the privileges to
--	create users and and databases.
-+Some systems require unusual options for compilation or linking that the
-+`configure' script does not know about.  Run `./configure --help' for
-+details on some of the pertinent environment variables.
- 
--	createuser -U postgres dbmail
-+   You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment.  Here
-+is an example:
- 
--	Off course you can use an other username than dbmail, simply replace
--	it. You can set a password for the user by doing a:
-+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
- 
--	ALTER USER dbmail WITH PASSWORD '<password>';
-+   *Note Defining Variables::, for more details.
- 
--	In a postgresql console, with <password> replaced by the actual 
--	password you want to use. After doing this you should create the
--	database for dbmail:
-+Compiling For Multiple Architectures
-+====================================
- 
--	createdb -U dbmail dbmail
-+You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
- 
--	The first dbmail is the user you just created, the second the name of
--	the database.  Of course you can use an other databasename. After
--	setting up the user and database it's time to create the tables, do a:
-+   If you have to use a `make' that does not support the `VPATH'
-+variable, you have to compile the package for one architecture at a
-+time in the source code directory.  After you have installed the
-+package for one architecture, use `make distclean' before reconfiguring
-+for another architecture.
- 
--	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+Installation Names
-+==================
- 
--	Don't forget to start postgresql with the -i option, so it accepts
--	TCP/IP connections.
-+By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
- 
--2. 	Set the database settings
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
- 
--	Copy the dbmail.conf file to /etc
--	Edit the dbmail.conf file and set everything in there
--	to your likeings.
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
- 
--	Make sure to set your database name, user and host are configured
--	in dbmail.conf. Other options in the configuration file are 
--	documented there.
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
- 
--3.	Run configure & make
--	Run the configure script. This script uses pg_config or mysql_config
--	(depending on --with-mysql or --with-pgsql) to detect where the
--	libraries and include files for these databases are.
-+Optional Features
-+=================
- 
--	e.g. when working with PostgreSQL, this is the configure command:
-+Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
- 
--	./configure --with-pgsql
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
- 
--	After running configure, 'make all' will build the executables.
--	
--	Running 'make install' will install the executables in /usr/local/sbin
-+Specifying the System Type
-+==========================
- 
--4.	Create users in the dbmail system
-+There may be some features `configure' cannot figure out automatically,
-+but needs to determine by the type of machine the package will run on.
-+Usually, assuming the package is built to be run on the _same_
-+architectures, `configure' can figure that out, but if it prints a
-+message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
- 
--	Next you will need to create some users into the dbmail mailing sytem.
--	Currently this can be done in two ways. One way is using the
--	dbmail-users utility. The other way is doing it in the database
--	itself. To do it using the dbmail-users utility and do the following:
-+     CPU-COMPANY-SYSTEM
- 
--	dbmail-users -a <username> -w <password> -g <clientid>\
--	             -m <maxmail> [-s aliases]
--	
--	clientid can be left 0 (this is if you want certain mailadministrators
--	administer specific groups of mailusers). maxmail is the maximum
--	number of bytes this user may have in his/her mailboxes. 0 is
--	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
--	number of aliases for this user. @domain are domain aliases. 
--	A user always needs to have at least one alias to receive mail, unless
--	the users username is something like foo@bar.org, where bar.org is 
--	a domain the mailserver deliveres to.
--	
--	example: 
--	./dbmail-users -a john -w secret -g 0 -m 25M\
--	               -s john@dude.org john@dude.net @net.com
--	
--	This will create a user john, with a password secret. It will set
--	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
--	and @net.com will be sent to john. The @net.com is a fallback alias.
--	This means that all mail that cannot be delivered to an existing alias
--	for a @net.com address will sent to john.
-+where SYSTEM can have one of these forms:
- 
--5.	Configure your MTA 
-+     OS KERNEL-OS
- 
--	There are two ways to connect your MTA to DBMail. The MTA can start a
--	dbmail-smtp process and pipe SMTP commands and messages to it, or it
--	can use lmtp (Local Mail Transport Protocol) to deliver via
--	dbmail-lmtpd. LMTP is the preferred solution because it offers more
--	robust error handling and because it is a daemon, high traffic servers
--	will have reduced delays which would be incurred starting up a
--	dbmail-smtp process for each message.
-+   See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
- 
--	The specifics of delivering to DBMail from your MTA can be found in
--	the INSTALL.<MTA Name> files. Currently there is documentation for
--	Postfix and Exim.
-+   If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
- 
--	If you use a different kind of mta that we do not have documentation
--	for: The dbmail injector program, dbmail-smtp, can receive information
--	in two ways. Either through raw mail (for example, delivered by
--	procmail) using the -n option or from a MTA with recipients in the
--	commandline using the -d option. Be carefull, the -n option is not
--	fully tested and may behave unexected. If possible use the -d option.
-+   If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
- 
--	Setup for LMTP should be straightforward if your MTA supports it.
-+Sharing Defaults
-+================
- 
--6.	Setting up the maintenance run
-+If you want to set default values for `configure' scripts to share, you
-+can create a site shell script called `config.site' that gives default
-+values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
- 
--	The dbmail daemons and the smtp injector itself will never actually
--	delete mail from the database. The only program that will do this is
--	the dbmail-util program. This program will also check the
--	integrity of the dbmail database and, if nescessary, fix it. The
--	dbmail-util program will first delete all messages that are set
--	for final deletion. After that it will set all messages that have the
--	delete status set to status final deletion. This way dbmail always
--	has a backup based upon the interval difference between maintenance
--	jobs. We recommend running the dbmail-util program in a daily
--	interval from cron:
-+Defining Variables
-+==================
- 
--	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
--	
--7.	Starting the servers
-+Variables not defined in a site shell script can be set in the
-+environment passed to `configure'.  However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost.  In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'.  For example:
- 
--	If you want users to be able to retrieve email via IMAP or POP3, run
--	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
--	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+     ./configure CC=/usr/local2/bin/gcc
- 
--8.	Problems
--	--------
--	For problems you can subscribe to the dbmail mailinglist: 
--	http://mailman.fastxs.nl/mailman/listinfo/dbmail
--	
--	Please always check the archives first.
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).  Here is a another example:
- 
--	or check out the dbmail website at http://www.dbmail.org.
-+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
- 
--	Please note that DBMail logs a lot of relevant data to the maillog
--	(often located at /var/log/maillog or /var/log/mail.log). This can
--	help you often if something is not working, e.g. if there's no
--	connection to the database.  
-+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-+configuration-related scripts to be executed by `/bin/bash'.
- 
-+`configure' Invocation
-+======================
- 
-+`configure' recognizes the following options to control how it operates.
-+
-+`--help'
-+`-h'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--version'
-+`-V'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`--cache-file=FILE'
-+     Enable the cache: use and save the results of the tests in FILE,
-+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-+     disable caching.
-+
-+`--config-cache'
-+`-C'
-+     Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`configure' also accepts some other, not widely useful, options.  Run
-+`configure --help' for more details.
-+
---- acinclude.m4	(revision 1905)
-+++ acinclude.m4	(revision 1948)
-@@ -4,138 +4,9 @@
- 
- # serial 1
- 
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
- dnl DBMAIL_BOTH_SQL_CHECK
- dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
-+AC_DEFUN([DBMAIL_BOTH_SQL_CHECK], [dnl
- AC_ARG_WITH(mysql,
-             [  --with-mysql            use MySQL as database. Uses mysql_config
- 	       		  for finding includes and libraries],
-@@ -187,7 +58,7 @@
- 
- dnl DBMAIL_CHECK_SQL_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SQL_LIBS], [dnl
- #Look for include files and libs needed to link
- #use the configuration utilities (mysql_config and pg_config for this)
- # MySQL first
-@@ -231,7 +102,7 @@
- ])
- dnl DBMAIL_SIEVE_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
-+AC_DEFUN([DBMAIL_SIEVE_CONF], [dnl
- AC_MSG_RESULT([checking for sorting configuration])
- AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
- 	sieveheadername="$withval$")
-@@ -287,7 +158,7 @@
- 
- dnl DBMAIL_CHECK_SIEVE_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SIEVE_LIBS], [dnl
- # Look for libs needed to link to SIEVE first
- if test ! "${sieveheadername-x}" = "x"
- then
-@@ -307,7 +178,7 @@
- 	
- dnl DBMAIL_AUTH_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
-+AC_DEFUN([DBMAIL_AUTH_CONF], [dnl
- AC_MSG_RESULT([checking for authentication configuration])
- AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
- 	authldapheadername="$withval$")
-@@ -363,7 +234,7 @@
- 
- dnl DBMAIL_CHECK_LDAP_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_LDAP_LIBS], [dnl
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
diff --git a/mail/dbmail-devel/files/patch-2.0.7_008 b/mail/dbmail-devel/files/patch-2.0.7_008
deleted file mode 100644
index ca3e9b671145..000000000000
--- a/mail/dbmail-devel/files/patch-2.0.7_008
+++ /dev/null
@@ -1,8766 +0,0 @@
---- pgsql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ pgsql/Makefile.in	Mon Dec 26 09:42:29 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,105 +12,140 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
--# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
--#
--# This program is free software; you can redistribute it and/or 
--# modify it under the terms of the GNU General Public License 
--# as published by the Free Software Foundation; either 
--# version 2 of the License, or (at your option) any later 
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
-+@SET_MAKE@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = pgsql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libpgsqldbmail_la_DEPENDENCIES =
-+am__libpgsqldbmail_la_SOURCES_DIST = dbpgsql.c
-+@PGSQL_TRUE@am_libpgsqldbmail_la_OBJECTS = dbpgsql.lo
-+libpgsqldbmail_la_OBJECTS = $(am_libpgsqldbmail_la_OBJECTS)
-+@PGSQL_TRUE@am_libpgsqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgsqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libpgsqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +153,167 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- 
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
-+# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
-+#
-+# This program is free software; you can redistribute it and/or 
-+# modify it under the terms of the GNU General Public License 
-+# as published by the Free Software Foundation; either 
-+# version 2 of the License, or (at your option) any later 
-+# version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- @PGSQL_TRUE@AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer
--
- @PGSQL_TRUE@pkglib_LTLIBRARIES = libpgsqldbmail.la
--
- @PGSQL_TRUE@libpgsqldbmail_la_SOURCES = dbpgsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
-+@PGSQL_TRUE@libpgsqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libpgsqldbmail_la_LDFLAGS = 
--libpgsqldbmail_la_LIBADD = 
--@PGSQL_TRUE@libpgsqldbmail_la_OBJECTS =  dbpgsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbpgsql.P
--SOURCES = $(libpgsqldbmail_la_SOURCES)
--OBJECTS = $(libpgsqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu pgsql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pgsql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  pgsql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libpgsqldbmail_la_rpath) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbpgsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = pgsql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pgsql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- buildtools/mkinstalldirs	Fri Aug 19 14:30:42 2005
-+++ buildtools/mkinstalldirs	Mon Dec 26 09:42:30 2005
-@@ -1,40 +1,158 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 802 2003-10-24 09:21:31Z ilja $
-+scriptversion=2005-06-29.22
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
- 
- errstatus=0
-+dirmode=
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
-+case $dirmode in
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
-+esac
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp"
--
--        mkdir "$pathcomp" || lasterr=$?
--
--        if test ! -d "$pathcomp"; then
--  	  errstatus=$lasterr
--        fi
--     fi
-+for file
-+do
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
--# mkinstalldirs ends here
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/ltmain.sh	Mon Aug 22 12:09:45 2005
-+++ buildtools/ltmain.sh	Mon Dec 26 09:42:30 2005
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -17,7 +17,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -43,9 +43,14 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.6
--TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-+VERSION="1.5.20 Debian 1.5.20-2"
-+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
- 
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
- 
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -83,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  SP2NL='tr \040 \012'
-+  NL2SP='tr \015\012 \040\040'
-   ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+  SP2NL='tr \100 \n'
-+  NL2SP='tr \r\n \100\100'
-   ;;
- esac
- 
-@@ -107,8 +113,9 @@
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   $echo "$modename: not configured to build any kind of library" 1>&2
-@@ -138,7 +145,8 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--func_win32_libid () {
-+func_win32_libid ()
-+{
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-@@ -178,7 +186,8 @@
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- # arg is usually of the form 'gcc ...'
--func_infer_tag () {
-+func_infer_tag ()
-+{
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
-@@ -235,6 +244,108 @@
-       esac
-     fi
- }
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+
-+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
-+}
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    ${rm}r unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd "$darwin_orig_dir"
-+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	fi # $run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+        ;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+    func_extract_archives_result="$my_oldobjs"
-+}
- # End of Shell function definitions
- #####################################
- 
-@@ -305,10 +416,10 @@
-   --version)
-     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-     $echo "This is free software; see the source for copying conditions.  There is NO"
-     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --config)
-@@ -317,7 +428,7 @@
-     for tagname in $taglist; do
-       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-     done
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --debug)
-@@ -342,7 +453,7 @@
-     else
-       $echo "disable static libraries"
-     fi
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -399,7 +510,7 @@
-   # Infer the operation mode.
-   if test -z "$mode"; then
-     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-     case $nonopt in
-     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-@@ -465,7 +576,7 @@
- 
-     for arg
-     do
--      case "$arg_mode" in
-+      case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
-@@ -547,7 +658,10 @@
-       case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
-+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+      # in scan sets (worked around with variable expansion),
-+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-+      # at all, so we specify them separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-@@ -621,6 +735,14 @@
-       esac
-     done
- 
-+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-+    case $qlibobj in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qlibobj="\"$qlibobj\"" ;;
-+    esac
-+    test "X$libobj" != "X$qlibobj" \
-+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-     if test "X$xdir" = "X$obj"; then
-@@ -693,12 +815,17 @@
- 	$run $rm $removelist
- 	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      $echo "$srcfile" > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
-+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-+    case $qsrcfile in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+      qsrcfile="\"$qsrcfile\"" ;;
-+    esac
- 
-     $run $rm "$libobj" "${libobj}T"
- 
-@@ -720,10 +847,10 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
-       if test ! -d "${xdir}$objdir"; then
-@@ -803,9 +930,9 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -1227,6 +1354,13 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        darwin_framework)
-+	  compiler_flags="$compiler_flags $arg"
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
-@@ -1285,6 +1419,14 @@
- 	continue
- 	;;
- 
-+      -framework|-arch)
-+        prev=darwin_framework
-+        compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+        continue
-+        ;;
-+
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -1345,7 +1487,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1356,7 +1498,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1366,8 +1508,20 @@
- 	continue
- 	;;
- 
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      -model)
-+	compile_command="$compile_command $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	finalize_command="$finalize_command $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	deplibs="$deplibs $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
- 	continue
- 	;;
- 
-@@ -1376,13 +1530,14 @@
- 	continue
- 	;;
- 
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m* pass through architecture-specific compiler args for GCC
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1858,7 +2013,7 @@
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    deplibs="$deplib $deplibs"
-+	    compiler_flags="$compiler_flags $deplib"
- 	  fi
- 	  continue
- 	  ;;
-@@ -1977,7 +2132,22 @@
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2051,6 +2221,8 @@
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
-+	avoidtemprpath=
-+
- 
- 	# Read the .la file
- 	case $lib in
-@@ -2149,11 +2321,19 @@
- 	    dir="$libdir"
- 	    absdir="$libdir"
- 	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
-@@ -2226,12 +2406,12 @@
- 	  if test -n "$library_names" &&
- 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath " in
- 	      *" $dir "*) ;;
- 	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      *) temp_rpath="$temp_rpath $absdir" ;;
- 	      esac
- 	    fi
- 
-@@ -2417,7 +2597,7 @@
- 		add_dir="-L$dir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
-+		  case $libdir in
- 		    [\\/]*)
- 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
-@@ -2490,7 +2670,7 @@
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
-+		case $libdir in
- 		  [\\/]*)
- 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
-@@ -2551,8 +2731,6 @@
- 	      fi
- 	    fi
- 	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
-@@ -2670,12 +2848,12 @@
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$depdepl $deplibs" ;;
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
-@@ -2947,7 +3125,7 @@
- 	case $current in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2956,7 +3134,7 @@
- 	case $revision in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2965,7 +3143,7 @@
- 	case $age in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2991,7 +3169,7 @@
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -3197,7 +3375,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -3247,7 +3425,7 @@
- 	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" -ne "0"; then
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3284,7 +3462,7 @@
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
-@@ -3336,7 +3514,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test  "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3405,7 +3583,7 @@
- 	  set dummy $deplibs_check_method
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3646,6 +3824,9 @@
- 	        # The command line is too long to execute in one step.
- 	        $show "using reloadable object file for export list..."
- 	        skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
-@@ -3679,67 +3860,13 @@
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
--
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -3769,7 +3896,8 @@
- 	  fi
- 	fi
- 
--	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" &&
-+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
-@@ -3788,6 +3916,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
-+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -3797,13 +3926,13 @@
- 	  delfiles=
- 	  last_robj=
- 	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
-+	  output=$output_objdir/$output_la-${k}.$objext
- 	  # Loop over the list of objects to be linked.
- 	  for obj in $save_libobjs
- 	  do
- 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- 	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
-+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 		 test "$len" -le "$max_cmd_len"; }; then
- 	      objlist="$objlist $obj"
- 	    else
-@@ -3817,9 +3946,9 @@
- 		# the last one created.
- 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- 	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      last_robj=$output_objdir/$output_la-${k}.$objext
- 	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
-+	      output=$output_objdir/$output_la-${k}.$objext
- 	      objlist=$obj
- 	      len=1
- 	    fi
-@@ -3839,13 +3968,13 @@
- 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
- 
--	  # Set up a command to remove the reloadale object files
-+	  # Set up a command to remove the reloadable object files
- 	  # after they are used.
- 	  i=0
- 	  while test "$i" -lt "$k"
- 	  do
- 	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- 	  done
- 
- 	  $echo "creating a temporary reloadable object file: $output"
-@@ -3893,13 +4022,30 @@
- 	  IFS="$save_ifs"
- 	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
-+	  $run eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      $show "${rm}r $gentop"
-+	      $run ${rm}r "$gentop"
-+	    fi
-+	  fi
-+
- 	  exit $EXIT_SUCCESS
- 	fi
- 
-@@ -3977,64 +4123,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -4296,12 +4388,12 @@
- 
- 	    # Prepare the list of exported symbols
- 	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
-+	      export_symbols="$output_objdir/$outputname.exp"
- 	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
- 	  fi
-@@ -4353,7 +4445,26 @@
- #endif
- 
- /* The mapping between symbol names and symbols. */
-+"
-+
-+	    case $host in
-+	    *cygwin* | *mingw* )
-+	  $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs */
-+struct {
-+"
-+	      ;;
-+	    * )
-+	  $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+	      ;;
-+	    esac
-+
-+
-+	  $echo >> "$output_objdir/$dlsyms" "\
-   const char *name;
-   lt_ptr address;
- }
-@@ -4582,7 +4693,7 @@
- 	esac
- 	case $host in
- 	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- 	    cwrapper=`$echo ${output}.exe`
- 	    $rm $cwrappersource $cwrapper
- 	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-@@ -4681,6 +4792,7 @@
- EOF
- 
- 	    cat >> $cwrappersource <<"EOF"
-+  return 127;
- }
- 
- void *
-@@ -4815,7 +4927,7 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -4944,13 +5056,13 @@
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
- 	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
-@@ -4960,7 +5072,7 @@
-     fi
-   else
-     # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit $EXIT_FAILURE
-@@ -4992,71 +5104,73 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
--	  fi
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-        cmds=$old_archive_from_new_cmds
-       else
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "copying selected object files to avoid basename conflicts..."
-+
-+	  if test -z "$gentop"; then
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	  fi
-+
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		counter=`expr $counter + 1`
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      $run ln "$obj" "$gentop/$newobj" ||
-+	      $run cp "$obj" "$gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	if len=`expr "X$cmds" : ".*"` &&
-@@ -5070,20 +5184,7 @@
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
--	  fi
-+
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
-@@ -5094,7 +5195,7 @@
- 	    oldobjs="$objlist $obj"
- 	    objlist="$objlist $obj"
- 	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
-+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	       test "$len" -le "$max_cmd_len"; then
- 	      :
- 	    else
-@@ -5291,11 +5392,11 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+       $echo "X$nonopt" | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5304,14 +5405,14 @@
-       shift
-     else
-       install_prog=
--      arg="$nonopt"
-+      arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-     case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-     esac
-@@ -5329,28 +5430,31 @@
-     do
-       if test -n "$dest"; then
- 	files="$files $dest"
--	dest="$arg"
-+	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
-+      -f) 
-+      	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o) prev=$arg ;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
--      -*) ;;
--
-+      -*)
-+	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  prev=
- 	else
--	  dest="$arg"
-+	  dest=$arg
- 	  continue
- 	fi
- 	;;
-@@ -5359,7 +5463,7 @@
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5528,11 +5632,14 @@
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- 	      fi
- 	    done
- 	  fi
-@@ -5545,7 +5652,16 @@
- 	    IFS="$save_ifs"
- 	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
-+	    $run eval "$cmd" || {
-+	      lt_exit=$?
-+
-+	      # Restore the uninstalled library and exit
-+	      if test "$mode" = relink; then
-+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	      fi
-+
-+	      exit $lt_exit
-+	    }
- 	  done
- 	  IFS="$save_ifs"
- 	fi
-@@ -5639,17 +5755,15 @@
- 	  notinst_deplibs=
- 	  relink_command=
- 
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
-@@ -5677,17 +5791,15 @@
- 	  done
- 
- 	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  outputname=
-@@ -5728,7 +5840,7 @@
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
-+	# one anyway 
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
-@@ -6398,7 +6510,7 @@
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit $EXIT_SUCCESS
-+exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
---- auth/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ auth/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1404 2004-10-14 09:13:17Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = auth
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libauthdbmail_la_DEPENDENCIES =
-+am__libauthdbmail_la_SOURCES_DIST = authsql.c authldap.c
-+@LDAP_FALSE@am_libauthdbmail_la_OBJECTS = authsql.lo
-+@LDAP_TRUE@am_libauthdbmail_la_OBJECTS = authldap.lo
-+libauthdbmail_la_OBJECTS = $(am_libauthdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libauthdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libauthdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,108 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- AM_CFLAGS = -fomit-frame-pointer
--
- pkglib_LTLIBRARIES = libauthdbmail.la
--@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
- @LDAP_FALSE@libauthdbmail_la_SOURCES = authsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libauthdbmail_la_LDFLAGS = 
--libauthdbmail_la_LIBADD = 
--@LDAP_TRUE@libauthdbmail_la_OBJECTS =  authldap.lo
--@LDAP_FALSE@libauthdbmail_la_OBJECTS =  authsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/authldap.P .deps/authsql.P
--SOURCES = $(libauthdbmail_la_SOURCES)
--OBJECTS = $(libauthdbmail_la_OBJECTS)
-+@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
-+libauthdbmail_la_LIBADD = -lcrypt @LDAPLIB@ @SQLLIB@
-+all: all-am
- 
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu auth/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  auth/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  auth/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldap.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -226,173 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = auth
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu auth/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+pdf-am:
- 
-+ps: ps-am
- 
--#libauthdbmail_la_LIBADD = -lcrypt
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- sort/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ sort/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1535 2004-12-27 09:48:06Z paul $ 
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $ 
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = sort
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libsortdbmail_la_DEPENDENCIES =
-+am__libsortdbmail_la_SOURCES_DIST = sort.c sortsieve.c
-+@SIEVE_FALSE@am_libsortdbmail_la_OBJECTS = sort.lo
-+@SIEVE_TRUE@am_libsortdbmail_la_OBJECTS = sort.lo sortsieve.lo
-+libsortdbmail_la_OBJECTS = $(am_libsortdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libsortdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libsortdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- pkglib_LTLIBRARIES = libsortdbmail.la
--@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_FALSE@libsortdbmail_la_SOURCES = sort.c
-+@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_TRUE@AM_CFLAGS = -DSIEVE
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libsortdbmail_la_LDFLAGS = 
--libsortdbmail_la_LIBADD = 
--@SIEVE_FALSE@libsortdbmail_la_OBJECTS =  sort.lo
--@SIEVE_TRUE@libsortdbmail_la_OBJECTS =  sort.lo sortsieve.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
-+libsortdbmail_la_LIBADD = @SORTLIB@
-+all: all-am
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/sort.P .deps/sortsieve.P
--SOURCES = $(libsortdbmail_la_SOURCES)
--OBJECTS = $(libsortdbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu sort/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sort/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  sort/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortsieve.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = sort
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sort/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- mysql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ mysql/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = mysql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libmysqldbmail_la_DEPENDENCIES =
-+am__libmysqldbmail_la_SOURCES_DIST = dbmysql.c
-+@MYSQL_TRUE@am_libmysqldbmail_la_OBJECTS = dbmysql.lo
-+libmysqldbmail_la_OBJECTS = $(am_libmysqldbmail_la_OBJECTS)
-+@MYSQL_TRUE@am_libmysqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libmysqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libmysqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,149 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- @MYSQL_TRUE@AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer 
--
- @MYSQL_TRUE@pkglib_LTLIBRARIES = libmysqldbmail.la
--
- @MYSQL_TRUE@libmysqldbmail_la_SOURCES = dbmysql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libmysqldbmail_la_LDFLAGS = 
--libmysqldbmail_la_LIBADD = 
--@MYSQL_TRUE@libmysqldbmail_la_OBJECTS =  dbmysql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
-+@MYSQL_TRUE@libmysqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbmysql.P
--SOURCES = $(libmysqldbmail_la_SOURCES)
--OBJECTS = $(libmysqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mysql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  mysql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libmysqldbmail_la_rpath) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmysql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = mysql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- aclocal.m4	Mon Aug 22 12:09:45 2005
-+++ aclocal.m4	Mon Dec 26 09:42:35 2005
-@@ -1,1423 +1,19 @@
--dnl aclocal.m4t generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Do all the work for Automake.  This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
--dnl DBMAIL_BOTH_SQL_CHECK
--dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
--AC_ARG_WITH(mysql,
--            [  --with-mysql            use MySQL as database. Uses mysql_config
--	       		  for finding includes and libraries],
--            mysqlheadername="$withval")
--AC_ARG_WITH(pgsql,
--	    [  --with-pgsql            use PostgreSQL as database. 
--                          Uses pg_config for finding includes and libraries],
--            pgsqlheadername="$withval")
--
--WARN=0
--# Make sure we only select one, mysql or pgsql
--if test "${mysqlheadername-x}" = "x"
--then
--  if test "${pgsqlheadername-x}" = "x"
--  then
--    NEITHER=1
--    mysqlheadername=""
--#    MYSQLINC=""
--#    PGSQLINC=""
--  fi
--fi
--if test "$NEITHER" = 1
--  then
--     AC_MSG_ERROR([
--
--     You have to specify --with-mysql or --with-pgsql to build.
--])
--fi
--
--if test ! "${mysqlheadername-x}" = "x"
--then
--  if test ! "${pgsqlheadername-x}" = "x"
--    then
--      WARN=1
--      mysqlheadername=""
--#      MYSQLINC=""
--#      PGSQLINC=""
--  fi
--fi
--if test "$WARN" = 1
--  then
--     AC_MSG_ERROR([
--
--     You cannot specify both --with-mysql and --with-pgsql on the same
--     build...
--])
--fi
--])
--
--dnl DBMAIL_CHECK_SQL_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
--#Look for include files and libs needed to link
--#use the configuration utilities (mysql_config and pg_config for this)
--# MySQL first
--if test ! "${mysqlheadername-x}" = "x"
--then
--    AC_PATH_PROG(mysqlconfig,mysql_config)
--    if test [ -z "$mysqlconfig" ]
--    then
--        AC_MSG_ERROR([mysql_config executable not found. Make sure mysql_config is in your path])
--    else
--	AC_MSG_CHECKING([MySQL headers])
--	MYSQLINC=`${mysqlconfig} --cflags`
--	AC_MSG_RESULT([$MYSQLINC])	
--        AC_MSG_CHECKING([MySQL libraries])
--        SQLLIB=`${mysqlconfig} --libs`
--        SQLALIB="mysql/.libs/libmysqldbmail.a"
--	SQLLTLIB="mysql/libmysqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--   fi
--else
--  if test ! "${pgsqlheadername-x}" = "x"
--  then
--    AC_PATH_PROG(pgsqlconfig,pg_config)
--    if test [ -z "$pgsqlconfig" ]
--    then
--        AC_MSG_ERROR([pg_config executable not found. Make sure pg_config is in your path])
--    else
--	AC_MSG_CHECKING([PostgreSQL headers])
--	PGINCDIR=`${pgsqlconfig} --includedir`
--	PGSQLINC="-I$PGINCDIR"
--	AC_MSG_RESULT([$PGSQLINC])
--        AC_MSG_CHECKING([PostgreSQL libraries])
--        PGLIBDIR=`${pgsqlconfig} --libdir`
--        SQLLIB="-L$PGLIBDIR -lpq"
--        SQLALIB="pgsql/.libs/libpgsqldbmail.a"
--	SQLLTLIB="pgsql/libpgsqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--    fi
--  fi
--fi
--])
--dnl DBMAIL_SIEVE_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
--AC_MSG_RESULT([checking for sorting configuration])
--AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
--	sieveheadername="$withval$")
--dnl This always needs to be defined
--SORTALIB="sort/.libs/libsortdbmail.a"
--SORTLTLIB="sort/libsortdbmail.la"
--
--WARN=0
--if test ! "${sieveheadername-x}" = "x"
--then
--  # --with-sieve was specified
--  AC_MSG_RESULT([using Sieve sorting])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for sieve2_interface.h (user supplied)])
--    if test -r "$sieveheadername/sieve2_interface.h"
--      then
--      # found
--        AC_MSG_RESULT([$sieveheadername/sieve2_interface.h])
--        SIEVEINC=$sieveheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        SIEVEINC=""
--        sieveheadername=""
--        AC_MSG_ERROR([
--  Unable to find sieve2_inteface.h where you specified, try just --with-sieve to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for sieve2_interface.h])
--    for sievepaths in $sieveheaderpaths
--    do
--      if test -r "$sievepaths/sieve2_interface.h"
--      then
--        SIEVEINC="$sievepaths"
--        AC_MSG_RESULT([$sievepaths/sieve2_interface.h])
--        break
--      fi
--    done
--    if test -z "$SIEVEINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate sieve2_inteface.h, try specifying with --with-sieve])
--    fi
--  fi
--else
--  AC_MSG_RESULT([not using any sorting])
--fi
--])
--
--dnl DBMAIL_CHECK_SIEVE_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
--# Look for libs needed to link to SIEVE first
--if test ! "${sieveheadername-x}" = "x"
--then
--  AC_CHECK_LIB(sieve,sieve2_listextensions,[ SIEVELIB="-lsieve"], [SIEVELIB=""])
--  if test -z "$SIEVELIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against libSieve.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no Sieve needed
--  SIEVELIB=""
--fi
--])
--	
--dnl DBMAIL_AUTH_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
--AC_MSG_RESULT([checking for authentication configuration])
--AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
--	authldapheadername="$withval$")
--dnl This always needs to be defined
--AUTHALIB="auth/.libs/libauthdbmail.a"
--AUTHLTLIB="auth/libauthdbmail.la"
--
--WARN=0
--if test ! "${authldapheadername-x}" = "x"
--then
--  # --with-auth-ldap was specified
--  AC_MSG_RESULT([using LDAP authentication])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for ldap.h (user supplied)])
--    if test -r "$authldapheadername/ldap.h"
--      then
--      # found
--        AC_MSG_RESULT([$authldapheadername/ldap.h])
--        LDAPINC=$authldapheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        LDAPINC=""
--        authldapheadername=""
--        AC_MSG_ERROR([
--  Unable to find ldap.h where you specified, try just --with-auth-ldap to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for ldap.h])
--    for ldappaths in $ldapheaderpaths
--    do
--      if test -r "$ldappaths/ldap.h"
--      then
--        LDAPINC="$ldappaths"
--        AC_MSG_RESULT([$ldappaths/ldap.h])
--        break
--      fi
--    done
--    if test -z "$LDAPINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate ldap.h, try specifying with --with-ldap])
--    fi
--  fi
--else
--  AC_MSG_RESULT([using SQL authentication])
--fi
--])
--
--dnl DBMAIL_CHECK_LDAP_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
--# Look for libs needed to link to LDAP first
--if test ! "${authldapheadername-x}" = "x"
--then
--  AC_CHECK_LIB(ldap,ldap_bind,[ LDAPLIB="-lldap"], [LDAPLIB=""])
--  if test -z "$LDAPLIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against ldap.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no ldap needed
--  LDAPLIB=""
--fi
--])
--dnl AC_COMPILE_WARNINGS
--dnl set to compile with '-W -Wall'
--AC_DEFUN([AC_COMPILE_WARNINGS],
--[AC_MSG_CHECKING(maximum warning verbosity option)
--if test -n "$CXX"
--then
--  if test "$GXX" = "yes"
--  then
--    ac_compile_warnings_opt='-Wall'
--  fi
--  CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
--fi
--if test -n "$CC"
--then
--  if test "$GCC" = "yes"
--  then
--    ac_compile_warnings_opt='-W -Wall -Wpointer-arith -Wstrict-prototypes'
--  fi
--  CFLAGS="$CFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
--fi
--AC_MSG_RESULT($ac_compile_warnings_msg)
--unset ac_compile_warnings_msg
--unset ac_compile_warnings_opt
--])
--
--# ----------------------------------------------------------------
--# DBMAIL_CHECK_GC
--# I cheated I copied from w3m's acinclude.m4 :)
--# Modified for DBMAIL by Dan Weber
--# ----------------------------------------------------------------
--AC_DEFUN([DBMAIL_CHECK_GC],
--[AC_MSG_CHECKING(for --with-gc)
--AC_ARG_WITH(gc,
-- [  --with-gc[=PREFIX]        libgc PREFIX],
-- [test x"$with_gc" = xno && with_gc="no"],
-- [with_gc="no"])
-- AC_MSG_RESULT($with_gc)
--# Don't check for gc if not appended to command line
-- if test x"$with_gc" = xyes
-- then
-- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
-- unset ac_cv_header_gc_h
-- AC_CHECK_HEADER(gc/gc.h)
-- if test x"$ac_cv_header_gc_h" = xno; then
--   AC_MSG_CHECKING(GC header location)
--   AC_MSG_RESULT($with_gc)
--   gcincludedir=no
--   for dir in $with_gc; do
--     for inc in include include/gc; do
--       cflags="$CFLAGS"
--       CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"
--       AC_MSG_CHECKING($dir/$inc)
--       unset ac_cv_header_gc_h
--       AC_CHECK_HEADER(gc/gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"; break])
--       CFLAGS="$cflags"
--     done
--     if test x"$gcincludedir" != xno; then
--       break;
--     fi
--   done
--   if test x"$gcincludedir" = xno; then
--     AC_MSG_ERROR([gc/gc.h not found])
--   fi
-- else
--  cflags="$CFLAGS -DUSE_GC=1"
--  CFLAGS="$cflags"
-- fi
-- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-- if test x"$ac_cv_lib_gc_GC_init" = xno; then
--    AC_MSG_CHECKING(GC library location)
--    AC_MSG_RESULT($with_gc)
--    gclibdir=no
--    for dir in $with_gc; do
--      ldflags="$LDFLAGS"
--      LDFLAGS="$LDFLAGS -L$dir/lib"
--      AC_MSG_CHECKING($dir)
--      unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
--      LDFLAGS="$ldflags"
--    done
--    if test x"$gclibdir" = xno; then
--      AC_MSG_ERROR([libgc not found])
--    fi
-- fi
--fi])
--
--# getopt.m4 serial 6
--dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# The getopt module assume you want GNU getopt, with getopt_long etc,
--# rather than vanilla POSIX getopt.  This means your your code should
--# always include <getopt.h> for the getopt prototypes.
--
--AC_DEFUN([CHECK_GETOPT_SUBSTITUTE],
--[
--  GETOPT_H=getopt.h
--  AC_LIBOBJ([getopt])
--  AC_LIBOBJ([getopt1])
--  AC_DEFINE([USE_DM_GETOPT], 1,
--    [Define if my_getopt should be used instead of the system's getopt.])
--  USE_DM_GETOPT=1
--  AC_SUBST([USE_DM_GETOPT])
--])
--
--AC_DEFUN([DBMAIL_CHECK_GETOPT],
--[
--  CHECK_PREREQ_GETOPT
--
--  if test -z "$GETOPT_H"; then
--    GETOPT_H=
--    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
--    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
--
--    dnl BSD getopt_long uses an incompatible method to reset option processing,
--    dnl and (as of 2004-10-15) mishandles optional option-arguments.
--    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
--
--    if test -n "$GETOPT_H"; then
--      CHECK_GETOPT_SUBSTITUTE
--    fi
--  fi
--])
--
--# Prerequisites of lib/getopt*.
--AC_DEFUN([CHECK_PREREQ_GETOPT], [:])
--
--#
--# socklen_t
--# from curl
--
--dnl Check for socklen_t: historically on BSD it is an int, and in
--dnl POSIX 1g it is a type of its own, but some platforms use different
--dnl types for the argument to getsockopt, getpeername, etc.  So we
--dnl have to test to find something that will work.
--AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T],
--[
--   AC_CHECK_TYPE([socklen_t], ,[
--      AC_MSG_CHECKING([for socklen_t equivalent])
--      AC_CACHE_VAL([socklen_t_equiv],
--      [
--         # Systems have either "struct sockaddr *" or
--         # "void *" as the second argument to getpeername
--         socklen_t_equiv=
--         for arg2 in "struct sockaddr" void; do
--            for t in int size_t unsigned long "unsigned long"; do
--               AC_TRY_COMPILE([
--                  #include <sys/types.h>
--                  #include <sys/socket.h>
--
--                  int getpeername (int, $arg2 *, $t *);
--               ],[
--                  $t len;
--                  getpeername(0,0,&len);
--               ],[
--                  socklen_t_equiv="$t"
--                  break
--               ])
--            done
--         done
--
--         if test "x$socklen_t_equiv" = x; then
--            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
--         fi
--      ])
--      AC_MSG_RESULT($socklen_t_equiv)
--      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
--                        [type to use in place of socklen_t if not defined])],
--      [#include <sys/types.h>
--#include <sys/socket.h>])
--])
--
--
--# lib-prefix.m4 serial 4 (gettext-0.14.2)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
--dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
--dnl require excessive bracketing.
--ifdef([AC_HELP_STRING],
--[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
--[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
--
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
--
--# lib-link.m4 serial 6 (gettext-0.14.3)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_PREREQ(2.50)
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
--  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
--
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
--
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
--
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  acl_cv_prog_gnu_ld=yes ;;
--*)
--  acl_cv_prog_gnu_ld=no ;;
--esac])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
--
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# Prepare PATH_SEPARATOR.
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break ;;
--      *)
--	test "$with_gnu_ld" != yes && break ;;
--      esac
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
--])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 47 AC_PROG_LIBTOOL
--# Debian $Rev: 214 $
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1527,7 +123,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
- 
- # Same as above, but do not quote variable references.
-@@ -1547,7 +143,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -1595,6 +191,8 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+_LT_CC_BASENAME([$compiler])
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -1640,6 +238,48 @@
- ])# _LT_AC_SYS_COMPILER
- 
- 
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
- # Links a minimal program and checks the executable
-@@ -1712,15 +352,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -1889,7 +529,7 @@
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -1971,7 +611,7 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1981,8 +621,10 @@
-    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-      fi
-    fi
-@@ -2008,11 +650,16 @@
-    LDFLAGS="$LDFLAGS $3"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-      else
-        $2=yes
-      fi
-@@ -2071,11 +718,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -2180,7 +854,7 @@
- }]
- EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) $1 ;;
-@@ -2329,7 +1003,7 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2341,11 +1015,13 @@
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -2409,8 +1085,8 @@
- [AC_MSG_CHECKING([how to hardcode library paths into programs])
- _LT_AC_TAGVAR(hardcode_action, $1)=
- if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2577,7 +1253,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2605,7 +1281,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -2635,7 +1312,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -2658,7 +1335,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -2693,8 +1370,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -2712,7 +1398,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -2739,7 +1425,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -2838,7 +1524,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -2913,7 +1599,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -3079,7 +1769,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  AC_LIBTOOL_LANG_CXX_CONFIG
- 	else
- 	  tagname=""
-@@ -3141,7 +1833,7 @@
- 
- # AC_LIBTOOL_WIN32_DLL
- # --------------------
--# declare package support for building win32 dll's
-+# declare package support for building win32 DLLs
- AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
- [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
- ])# AC_LIBTOOL_WIN32_DLL
-@@ -3315,7 +2007,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -3425,7 +2117,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -3457,7 +2149,7 @@
- AC_DEFUN([AC_PROG_LD_GNU],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -3484,6 +2176,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- ])# AC_PROG_LD_RELOAD_FLAG
- 
- 
-@@ -3517,7 +2218,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3540,13 +2241,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -3562,7 +2263,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3612,12 +2313,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -3738,13 +2437,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl convenience library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-convenience to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!).  If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
- AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case $enable_ltdl_convenience in
-@@ -3763,13 +2462,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl installable library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!).  If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-install to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
- AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -3807,10 +2506,21 @@
- # ---------------
- AC_DEFUN([_LT_AC_LANG_CXX],
- [AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
- ])# _LT_AC_LANG_CXX
- 
-+# _LT_AC_PROG_CXXCPP
-+# ---------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
- 
- # AC_LIBTOOL_F77
- # --------------
-@@ -3883,6 +2593,10 @@
- 
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -3933,7 +2647,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -3946,43 +2660,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
-     ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -4008,7 +2685,7 @@
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_PUSH(C++)
- AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -4037,7 +2714,7 @@
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -4052,6 +2729,10 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -4073,7 +2754,7 @@
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -4180,7 +2861,7 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -4201,6 +2882,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -4246,7 +2930,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -4260,6 +2944,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -4283,65 +2968,76 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
--    ;;
-+        ;;
- 
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4352,14 +3048,14 @@
- 	;;
-     esac
-     ;;
--  freebsd[12]*)
-+  freebsd[[12]]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4376,11 +3072,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
--    aCC)
-+    aCC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -4390,7 +3086,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -4404,7 +3100,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -4420,7 +3116,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4441,12 +3137,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -4467,7 +3163,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -4485,9 +3181,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -4498,7 +3194,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -4511,7 +3207,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4536,17 +3232,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -4577,7 +3297,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4598,9 +3318,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  openbsd*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4616,14 +3352,14 @@
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4641,7 +3377,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4660,7 +3396,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4675,17 +3411,17 @@
- 	# the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4704,7 +3440,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4728,7 +3464,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4740,12 +3476,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4758,36 +3494,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -4795,7 +3528,7 @@
- 	# in the archive.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -4838,7 +3571,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4944,7 +3677,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -5020,6 +3753,21 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+])
-+
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -5070,12 +3818,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-@@ -5085,7 +3837,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -5094,7 +3846,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -5145,20 +3899,27 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- 
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- 
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
- AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
- AC_LIBTOOL_PROG_COMPILER_PIC($1)
- AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -5201,11 +3962,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- 
- AC_LIBTOOL_CONFIG($1)
-@@ -5341,7 +4107,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -5352,11 +4118,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -5387,6 +4153,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -5463,7 +4235,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -5737,9 +4509,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -5761,6 +4530,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDGIRSTW]]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[[BCDEGRST]]'
-   ;;
-@@ -5792,8 +4568,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -5957,7 +4736,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -5982,18 +4761,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6001,22 +4790,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -6031,7 +4820,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -6042,18 +4831,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -6070,7 +4865,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -6081,14 +4876,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -6104,7 +4899,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -6113,13 +4908,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- 	    ;;
-@@ -6129,12 +4924,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6144,7 +4939,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
-@@ -6215,7 +5010,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6241,6 +5036,16 @@
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -6252,7 +5057,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6276,12 +5081,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-       ccc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         # All Alpha code is PIC.
-@@ -6302,9 +5114,14 @@
-       ;;
- 
-     solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -6326,6 +5143,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-     uts4*)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6353,7 +5175,7 @@
-     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -6386,7 +5208,7 @@
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6432,7 +5254,8 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
--
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  _LT_CC_BASENAME([$compiler])
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -6452,6 +5275,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -6502,7 +5346,7 @@
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_AC_TAGVAR(always_export_symbols, $1)=no
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -6516,7 +5360,39 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
-@@ -6551,39 +5427,13 @@
-       fi
-       ;;
- 
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--      fi
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6594,16 +5444,11 @@
-       ;;
-     esac
- 
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
--      runpath_var=LD_RUN_PATH
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--      fi
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -6667,7 +5512,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.[012]|aix4.[012].*)
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -6688,6 +5533,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -6732,7 +5580,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -6746,7 +5594,7 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[[45]]*)
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-@@ -6767,57 +5615,57 @@
-       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      case "$host_os" in
--      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
-+      case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -6851,7 +5699,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6876,7 +5724,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -6885,7 +5733,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -6895,7 +5743,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -6962,6 +5810,7 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-@@ -7007,7 +5856,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -7026,10 +5875,12 @@
-     solaris*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -7038,8 +5889,18 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       case $host_os in
-       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-@@ -7300,7 +6161,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7325,8 +6186,887 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- ])
-+SED=$lt_cv_path_SED
- AC_MSG_RESULT([$SED])
- ])
- 
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
diff --git a/mail/dbmail-devel/pkg-descr b/mail/dbmail-devel/pkg-descr
deleted file mode 100644
index 2c03d30b6ea9..000000000000
--- a/mail/dbmail-devel/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Dbmail is the name of a group of programs that enable the possiblilty of storing
-and retrieving mail messages from a database (currently MySQL or PostgreSQL).
-
-What are the advantages?
-
-    * Scalability.
-      Dbmail is as scalable as the database that is used for the mail storage.
-    * Manageability.
-      Dbmail is based upon a database. Dbmail can be managed by changing
-      settings in the database (f.e. using PHP/Perl/SQL).
-    * Speed.
-      Dbmail uses very efficient, database specific queries for retrieving mail
-      information. This is much faster then parsing a filesystem.
-    * Security.
-      Dbmail has got nothing to do with the filesystem or interaction with other
-      programs in the Unix environment which need special permissions.  Dbmail
-      is as secure as the database it's based upon.
-    * Flexibility.
-      Changes on a Dbmail system (adding of users, changing passwords etc.) are
-      effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist
deleted file mode 100644
index dc430f4e2413..000000000000
--- a/mail/dbmail-devel/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-etc/dbmail.conf-dist
-lib/dbmail/libauthdbmail.so.0
-lib/dbmail/libauthdbmail.a
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libauthdbmail.so
-lib/dbmail/libsortdbmail.so.0
-lib/dbmail/libsortdbmail.a
-lib/dbmail/libsortdbmail.la
-lib/dbmail/libsortdbmail.so
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
-%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%lib/dbmail/libmysqldbmail.so.0
-%%MYSQL%%lib/dbmail/libmysqldbmail.a
-%%MYSQL%%lib/dbmail/libmysqldbmail.la
-%%MYSQL%%lib/dbmail/libmysqldbmail.so
-%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so.0
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so
-@dirrm lib/dbmail
-@dirrm %%DATADIR%%/sql
-@dirrm %%DATADIR%%
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
deleted file mode 100644
index cb7adc9d2047..000000000000
--- a/mail/dbmail20/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for:	dbmail
-# Date created:				07/26/2003
-# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbmail
-PORTVERSION=	2.0.7
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.0/
-PKGNAMESUFFIX=	-${DATABASE}
-
-MAINTAINER=	mark_sf@kikg.ifmo.ru
-COMMENT=	An SQL database-based mail system (POP3 and IMAP)
-
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	YES
-USE_OPENSSL=	YES
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
-INSTALLS_SHLIB=	yes
-
-CFLAGS += -fPIC
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=	--with-pgsql
-USE_PGSQL=		yes
-DATABASE=		postgresql
-PLIST_SUB+=		PGSQL=""
-PLIST_SUB+=		MYSQL="@comment "
-LDFLAGS+=		-L${LOCALBASE}/lib/
-.else
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql
-DATABASE=		mysql
-PLIST_SUB+=		MYSQL=""
-PLIST_SUB+=		PGSQL="@comment "
-CFLAGS+=		-I${LOCALBASE}/include/mysql
-LDFLAGS+=		-L${LOCALBASE}/lib/mysql
-.endif
-
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
-PORTDOCS=		INSTALL README EXTRAS
-
-MAN1=			dbmail-smtp.1
-MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
-			dbmail-users.8 dbmail-util.8
-MANCOMPRESSED=		no
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} "   By default dbmail uses MySQL backend database."
-	@${ECHO} "   To build dbmail with PostgreSQL as backend database,"
-	@${ECHO} "	define WITH_POSTGRESQL"
-	@${ECHO} ""
-
-post-patch:
-	${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	${FIND} ${WRKSRC} -name '*.orig' -type f -delete
-
-post-configure:
-	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
-				${WRKSRC}/dbmail.h
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@${MKDIR} ${DATADIR}/sql
-	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
-	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${ECHO} ""
-	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
-	@${ECHO} ""
-	@${ECHO} "	*) Don't forget to update the database using a script from"
-	@${ECHO} "	   ${DATADIR}/sql/"
-	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
-	@${ECHO} "	*) Read the upgrading notes."
-	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
-	@${ECHO} "	*) dbmail can be controled by setting dbmail_imapd_enable,"
-	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
-	@${ECHO} "	   /etc/rc.conf."
-	@${ECHO} ""
-
-.include <bsd.port.mk>
diff --git a/mail/dbmail20/distinfo b/mail/dbmail20/distinfo
deleted file mode 100644
index b2ac397cfd4c..000000000000
--- a/mail/dbmail20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.0.7.tar.gz) = 11e6eded9e5ec533f6e6ed11fc62a4d8
-SHA256 (dbmail-2.0.7.tar.gz) = ef678002a0f6eed3ae8babc17760e36a76e678852c50d70d8dee1fe693f54026
-SIZE (dbmail-2.0.7.tar.gz) = 584457
diff --git a/mail/dbmail20/files/dbmail-imapd.sh.in b/mail/dbmail20/files/dbmail-imapd.sh.in
deleted file mode 100644
index 82505e96d9b0..000000000000
--- a/mail/dbmail20/files/dbmail-imapd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-imapd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-imapd: 
-#
-#dbmail_imapd_enable="YES"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_imapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail20/files/dbmail-lmtpd.sh.in b/mail/dbmail20/files/dbmail-lmtpd.sh.in
deleted file mode 100644
index f1133f43a70e..000000000000
--- a/mail/dbmail20/files/dbmail-lmtpd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-lmtpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: 
-#
-#dbmail_lmtpd_enable="YES"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_lmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail20/files/dbmail-pop3d.sh.in b/mail/dbmail20/files/dbmail-pop3d.sh.in
deleted file mode 100644
index d787f6a668e7..000000000000
--- a/mail/dbmail20/files/dbmail-pop3d.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-pop3d
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
-#
-#dbmail_pop3d_enable="YES"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_pop3d
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail20/files/patch-2.0.7_001_266 b/mail/dbmail20/files/patch-2.0.7_001_266
deleted file mode 100644
index b3650d832c24..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_001_266
+++ /dev/null
@@ -1,27 +0,0 @@
---- server.c.orig	Wed Aug 24 13:35:38 2005
-+++ server.c	Tue Sep 13 22:21:59 2005
-@@ -119,7 +119,7 @@
-   
-  	trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop");
-  	while (!GeneralStopRequested) {
--		if (db_connect() != 0) {
-+		if (db_check_connection() != 0) {
- 			
- 			if (! stopped) 
- 				manage_stop_children();
-@@ -128,12 +128,11 @@
- 			sleep(10);
- 			
- 		} else {
--			if (stopped) 
-+			if (stopped) {
-+				manage_restart_children();
- 				stopped=0;
-- 			
--			db_disconnect();
-+			}
- 
--			manage_restart_children();
- 			manage_spare_children();
- 
- 			sleep(1);
diff --git a/mail/dbmail20/files/patch-2.0.7_002 b/mail/dbmail20/files/patch-2.0.7_002
deleted file mode 100644
index 81d8790d3614..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_002
+++ /dev/null
@@ -1,1397 +0,0 @@
---- ChangeLog	(revision 1888)
-+++ ChangeLog	(revision 1889)
-@@ -1,3 +1,17 @@
-+2005-09-27  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
-+	  debian/changelog, server.c:
-+	do not close database connection on startup (closes: #271)
-+
-+2005-09-23  Paul J Stevens <paul@nfg.nl>
-+
-+	* debian/control, debian/patches/00list, 
-+	  debian/patches/04_mailfilter.dpatch:
-+	added mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	fix some compiler warnings in mailfilter patch
-+
- 2005-09-14  Paul J Stevens <paul@nfg.nl>
- 
- 	* debian/control:
---- buildtools/config.guess	(revision 1888)
-+++ buildtools/config.guess	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-08-03'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,13 +17,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -66,11 +68,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -123,7 +125,7 @@
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -196,55 +198,20 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    luna88k:OpenBSD:*:*)
--    	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -297,40 +264,43 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-     *:z/VM:*:*)
- 	echo s390-ibm-zvmoe
--	exit 0 ;;
-+	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -372,10 +342,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +357,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +371,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +428,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +470,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +500,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -544,14 +515,18 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:[45])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-@@ -565,28 +540,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -648,9 +623,19 @@
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -658,11 +643,11 @@
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +675,166 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
- 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
-+	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
--    amd64:CYGWIN*:*:*)
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     crisv32:Linux:*:*)
- 	echo crisv32-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -862,7 +852,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -881,14 +871,17 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +895,7 @@
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +903,25 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +939,15 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
-+		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
-+		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
-+		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -982,15 +975,18 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -998,27 +994,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--	i*86:syllable:*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1026,15 +1022,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1052,73 +1049,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
-+	exit ;;
-     M68*:*:R3V[5678]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1126,65 +1123,65 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo ${UNAME_MACHINE}-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-@@ -1192,7 +1189,7 @@
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1200,25 +1197,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
-+	exit ;;
-     NSE-?:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1229,41 +1226,44 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     *:*VMS:*:*)
-     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
--	    A*) echo alpha-dec-vms && exit 0 ;;
--	    I*) echo ia64-dec-vms && exit 0 ;;
--	    V*) echo vax-dec-vms && exit 0 ;;
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
- 	esac ;;
-     *:XENIX:*:SysV)
- 	echo i386-pc-xenix
--	exit 0 ;;
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1295,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1384,11 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1397,22 +1398,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
---- buildtools/config.sub	(revision 1888)
-+++ buildtools/config.sub	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-07-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +21,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
- #
-@@ -83,11 +84,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +100,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -247,6 +248,7 @@
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-@@ -255,13 +257,14 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| ms1 \
- 	| msp430 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b \
-@@ -273,6 +276,9 @@
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -321,6 +327,7 @@
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-@@ -329,6 +336,7 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| mmix-* \
-+	| ms1-* \
- 	| msp430-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
-@@ -336,7 +344,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -351,6 +359,8 @@
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -761,9 +771,8 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
- 		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -1089,12 +1098,9 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
-@@ -1181,7 +1187,8 @@
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1199,7 +1206,7 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
-@@ -1388,6 +1395,9 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-@@ -1559,7 +1569,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mail/dbmail20/files/patch-2.0.7_002_271 b/mail/dbmail20/files/patch-2.0.7_002_271
deleted file mode 100644
index 40a21687020a..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_002_271
+++ /dev/null
@@ -1,10 +0,0 @@
---- server.c	(revision 1888)
-+++ server.c	(revision 1889)
-@@ -98,7 +98,6 @@
- 		return -1;
- 	if (db_check_version() != 0)
- 		return -1;
--	db_disconnect();
- 		
- 	ParentPID = getpid();
- 	Restart = 0;
diff --git a/mail/dbmail20/files/patch-2.0.7_003 b/mail/dbmail20/files/patch-2.0.7_003
deleted file mode 100644
index 1b83d01d5dca..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_003
+++ /dev/null
@@ -1,25 +0,0 @@
---- serverchild.c	(revision 1889)
-+++ serverchild.c	(revision 1890)
-@@ -312,19 +312,16 @@
- 
- 		client.timeoutMsg = info->timeoutMsg;
- 		client.timeout = info->timeout;
--		strncpy(client.ip, inet_ntoa(saClient.sin_addr),
--			IPNUM_LEN);
-+		strncpy(client.ip, inet_ntoa(saClient.sin_addr), IPNUM_LEN);
- 		client.clientname[0] = '\0';
- 
- 		if (info->resolveIP) {
--			clientHost =
--			    gethostbyaddr((char *) &saClient.sin_addr,
-+			clientHost = gethostbyaddr((char *) &saClient.sin_addr,
- 					  sizeof(saClient.sin_addr),
- 					  saClient.sin_family);
- 
- 			if (clientHost && clientHost->h_name)
--				strncpy(client.clientname,
--					clientHost->h_name, FIELDSIZE);
-+				strncpy(client.clientname, clientHost->h_name, FIELDSIZE);
- 
- 			trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]",
- 					__FILE__, __func__,
diff --git a/mail/dbmail20/files/patch-2.0.7_003_272 b/mail/dbmail20/files/patch-2.0.7_003_272
deleted file mode 100644
index 0bc97c9d9a2b..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_003_272
+++ /dev/null
@@ -1,22 +0,0 @@
---- sql/mysql/create_tables.mysql	(revision 1889)
-+++ sql/mysql/create_tables.mysql	(revision 1890)
-@@ -118,7 +118,7 @@
- CREATE TABLE dbmail_messageblks (
-    messageblk_idnr bigint(21) NOT NULL auto_increment,
-    physmessage_id bigint(21) DEFAULT '0' NOT NULL,
--   messageblk longtext NOT NULL,
-+   messageblk longblob NOT NULL,
-    blocksize bigint(21) DEFAULT '0' NOT NULL,
-    is_header tinyint(1) DEFAULT '0' NOT NULL,
-    PRIMARY KEY (messageblk_idnr),
---- sql/mysql/create_tables_innoDB.mysql	(revision 1889)
-+++ sql/mysql/create_tables_innoDB.mysql	(revision 1890)
-@@ -148,7 +148,7 @@
- CREATE TABLE dbmail_messageblks (
- 	messageblk_idnr bigint(21) NOT NULL auto_increment,
- 	physmessage_id bigint(21) NOT NULL default '0',
--	messageblk longtext NOT NULL,
-+	messageblk longblob NOT NULL,
- 	blocksize bigint(21) NOT NULL default '0',
- 	is_header tinyint(1) NOT NULL default '0',
- 	PRIMARY KEY (messageblk_idnr),
diff --git a/mail/dbmail20/files/patch-2.0.7_004 b/mail/dbmail20/files/patch-2.0.7_004
deleted file mode 100644
index 8bbd3b8c3f92..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_004
+++ /dev/null
@@ -1,95 +0,0 @@
---- ChangeLog	(revision 1890)
-+++ ChangeLog	(revision 1904)
-@@ -1,3 +1,12 @@
-+2005-10-01  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	added postgres table to mailfilter patch
-+	* debian/changelog, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	change dbmail_messageblks.messageblk from longtext to longblob in mysql
-+	create scripts
-+
- 2005-09-27  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
---- dsn.c	(revision 1890)
-+++ dsn.c	(revision 1904)
-@@ -309,8 +309,10 @@
- 	 */
- 	else {		/* from: 'if (delivery->useridnr != 0)' */
- 
--		alias_count =
--		    auth_check_user_ext(delivery->address,
-+		if (! strlen(delivery->address))
-+			return 0;
-+		
-+		alias_count = auth_check_user_ext(delivery->address,
- 					delivery->userids,
- 					delivery->forwards, 0);
- 		trace(TRACE_DEBUG,
---- auth/authsql.c	(revision 1890)
-+++ auth/authsql.c	(revision 1904)
-@@ -385,6 +385,9 @@
- 		return 0;
- 	}
- 	
-+	if (strlen(username) < 1)
-+		return 0;
-+
- 	saveres = db_get_result_set();
- 	db_set_result_set(NULL);
- 
---- main.c	(revision 1890)
-+++ main.c	(revision 1904)
-@@ -405,27 +405,25 @@
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
--		trace(TRACE_DEBUG, "main(): scanning for [%s]",
--		      deliver_to_header);
--		if (mail_adr_list(deliver_to_header, &users, &mimelist) !=
--		    0) {
--			trace(TRACE_STOP,
--			      "main(): scanner found no email addresses (scanned for %s)",
-+		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
-+		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
-+			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
- 			      deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
- 
- 		/* Loop through the users list, moving the entries into the dsnusers list. */
--		for (tmp = list_getstart(&users); tmp != NULL;
--		     tmp = tmp->nextnode) {
--			deliver_to_user_t dsnuser;
-+		for (tmp = list_getstart(&users); tmp != NULL; tmp = tmp->nextnode) {
- 
-+			if (! (strlen((char *)tmp->data) > 0))
-+				continue;
-+
-+			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser,
--				     sizeof(deliver_to_user_t));
-+			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
- 		}
- 	}
- 
-@@ -433,11 +431,10 @@
- 	if (deliver_to_mailbox != NULL) {
- 		trace(TRACE_DEBUG, "main(): setting mailbox for all deliveries to [%s]",
- 		      deliver_to_mailbox);
-+		
- 		/* Loop through the dsnusers list, setting the destination mailbox. */
--		for (tmp = list_getstart(&dsnusers); tmp != NULL;
--		     tmp = tmp->nextnode) {
-+		for (tmp = list_getstart(&dsnusers); tmp != NULL; tmp = tmp->nextnode) 
- 			((deliver_to_user_t *)tmp->data)->mailbox = dm_strdup(deliver_to_mailbox);
--		}
- 	}
- 
- 	if (dsnuser_resolve_list(&dsnusers) == -1) {
diff --git a/mail/dbmail20/files/patch-2.0.7_005 b/mail/dbmail20/files/patch-2.0.7_005
deleted file mode 100644
index 573a8e836f0b..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_005
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog	(revision 1904)
-+++ ChangeLog	(revision 1905)
-@@ -1,3 +1,8 @@
-+2005-10-18  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, auth/authsql.c, dsn.c, main.c:
-+	ignore empty addresses in delivery chain
-+
- 2005-10-01  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, debian/patches/04_mailfilter.dpatch:
diff --git a/mail/dbmail20/files/patch-2.0.7_005_277 b/mail/dbmail20/files/patch-2.0.7_005_277
deleted file mode 100644
index b659de88aac4..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_005_277
+++ /dev/null
@@ -1,38 +0,0 @@
---- imapcommands.c	(revision 1904)
-+++ imapcommands.c	(revision 1905)
-@@ -1787,6 +1787,8 @@
- 	if (args[i + 1]) {
- 		struct tm tm;
- 
-+		memset(&tm, 0, sizeof(struct tm));
-+
- 		if (strptime(args[i], "%d-%b-%Y %T", &tm) != NULL)
- 			strftime(sqldate,
- 				 sizeof(sqldate), "%Y-%m-%d %H:%M:%S",
---- imaputil.c	(revision 1904)
-+++ imaputil.c	(revision 1905)
-@@ -1788,13 +1788,14 @@
- 	time_t ltime;
-         char *last;
- 
-+	memset(&tm_sql_date, 0, sizeof(struct tm));
-+	
-         last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date);
-         if ( (last == NULL) || (*last != '\0') ) {
-                 strcpy(_imapdate, IMAP_STANDARD_DATE);
-                 return _imapdate;
-         }
- 
--	/* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */
- 	ltime = mktime (&tm_sql_date);
- 	tm_imap_date = localtime(&ltime);
- 
-@@ -1814,6 +1815,8 @@
- 	struct tm tm;
- 	char *last_char;
- 
-+	memset(&tm, 0, sizeof(struct tm));
-+
- 	last_char = strptime(imapdate, "%d-%b-%Y", &tm);
- 	if (last_char == NULL || *last_char != '\0') {
- 		trace(TRACE_DEBUG, "%s,%s: error parsing IMAP date %s",
diff --git a/mail/dbmail20/files/patch-2.0.7_006_281 b/mail/dbmail20/files/patch-2.0.7_006_281
deleted file mode 100644
index 40e64bebc054..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_006_281
+++ /dev/null
@@ -1,52 +0,0 @@
---- main.c	(revision 1905)
-+++ main.c	(revision 1948)
-@@ -388,8 +388,8 @@
- 
- 	/* parse the list and scan for field and content */
- 	if (mime_readheader(header, &dummyidx, &mimelist, &dummysize) < 0) {
--		trace(TRACE_ERROR,
--		      "main(): mime_readheader failed to read a header list");
-+		trace(TRACE_ERROR, "%s,%s: mime_readheader failed", 
-+				__FILE__, __func__);
- 		exitcode = EX_TEMPFAIL;
- 		goto freeall;
- 	}
-@@ -400,15 +400,16 @@
- 	if (returnpath.total_nodes == 0)
- 		mail_adr_list("From", &returnpath, &mimelist);
- 	if (returnpath.total_nodes == 0)
--		trace(TRACE_DEBUG, "main(): no return path found.");
-+		trace(TRACE_DEBUG, "%s,%s: no return path found.",
-+				__FILE__,__func__);
- 
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
- 		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
- 		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
--			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
--			      deliver_to_header);
-+			trace(TRACE_STOP, "%s,%s: no email addresses found (scanned for %s)",
-+					__FILE__,__func__, deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
-@@ -419,11 +420,16 @@
- 			if (! (strlen((char *)tmp->data) > 0))
- 				continue;
- 
--			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
-+			if (! list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t))) {
-+				trace(TRACE_ERROR,"%s,%s: out of memory in list_nodeadd", 
-+						__FILE__, __func__);
-+				exitcode = EX_TEMPFAIL;
-+				goto freeall;
-+			}
-+			
- 		}
- 	}
- 
diff --git a/mail/dbmail20/files/patch-2.0.7_007 b/mail/dbmail20/files/patch-2.0.7_007
deleted file mode 100644
index 6d221a2ef59f..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_007
+++ /dev/null
@@ -1,9108 +0,0 @@
---- Makefile.in	(revision 1905)
-+++ Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,86 +32,209 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- 
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = .
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+bin_PROGRAMS = $(am__EXEEXT_1)
-+sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
-+	dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) \
-+	dbmail-users$(EXEEXT) dbmail-lmtpd$(EXEEXT)
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.in \
-+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-+	THANKS TODO buildtools/config.guess buildtools/config.sub \
-+	buildtools/depcomp buildtools/install-sh buildtools/ltmain.sh \
-+	buildtools/missing buildtools/mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libdbmail_la_DEPENDENCIES =
-+am__libdbmail_la_SOURCES_DIST = config.c debug.c list.c dbmd5.c md5.c \
-+	db.c misc.c mime.c pidfile.c dm_getopt.c server.c \
-+	serverchild.c pool.c header.c pipe.c forward.c dsn.c
-+@USE_DM_GETOPT_TRUE@am__objects_1 = dm_getopt.lo
-+am__objects_2 = config.lo debug.lo list.lo dbmd5.lo md5.lo db.lo \
-+	misc.lo mime.lo pidfile.lo $(am__objects_1)
-+am__objects_3 = server.lo serverchild.lo pool.lo
-+am__objects_4 = header.lo pipe.lo forward.lo dsn.lo
-+am_libdbmail_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-+	$(am__objects_4)
-+libdbmail_la_OBJECTS = $(am_libdbmail_la_OBJECTS)
-+@SIEVE_TRUE@am__EXEEXT_1 = dbmail-sievecmd$(EXEEXT) \
-+@SIEVE_TRUE@	dbmail-timsieved$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+am_dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \
-+	imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
-+	rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) \
-+	dbmsgbuf.$(OBJEXT) acl.$(OBJEXT)
-+dbmail_imapd_OBJECTS = $(am_dbmail_imapd_OBJECTS)
-+dbmail_imapd_DEPENDENCIES = libdbmail.la
-+am_dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
-+dbmail_lmtpd_OBJECTS = $(am_dbmail_lmtpd_OBJECTS)
-+dbmail_lmtpd_DEPENDENCIES = libdbmail.la
-+am_dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT)
-+dbmail_pop3d_OBJECTS = $(am_dbmail_pop3d_OBJECTS)
-+dbmail_pop3d_DEPENDENCIES = libdbmail.la
-+am__dbmail_sievecmd_SOURCES_DIST = sievecmd.c
-+@SIEVE_TRUE@am_dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT)
-+dbmail_sievecmd_OBJECTS = $(am_dbmail_sievecmd_OBJECTS)
-+@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la
-+am_dbmail_smtp_OBJECTS = main.$(OBJEXT)
-+dbmail_smtp_OBJECTS = $(am_dbmail_smtp_OBJECTS)
-+dbmail_smtp_DEPENDENCIES = libdbmail.la
-+am__dbmail_timsieved_SOURCES_DIST = timsieve.c timsieved.c
-+@SIEVE_TRUE@am_dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \
-+@SIEVE_TRUE@	timsieved.$(OBJEXT)
-+dbmail_timsieved_OBJECTS = $(am_dbmail_timsieved_OBJECTS)
-+@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la
-+am_dbmail_users_OBJECTS = user.$(OBJEXT)
-+dbmail_users_OBJECTS = $(am_dbmail_users_OBJECTS)
-+dbmail_users_DEPENDENCIES = libdbmail.la
-+am_dbmail_util_OBJECTS = maintenance.$(OBJEXT)
-+dbmail_util_OBJECTS = $(am_dbmail_util_OBJECTS)
-+dbmail_util_DEPENDENCIES = libdbmail.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdbmail_la_SOURCES) $(dbmail_imapd_SOURCES) \
-+	$(dbmail_lmtpd_SOURCES) $(dbmail_pop3d_SOURCES) \
-+	$(dbmail_sievecmd_SOURCES) $(dbmail_smtp_SOURCES) \
-+	$(dbmail_timsieved_SOURCES) $(dbmail_users_SOURCES) \
-+	$(dbmail_util_SOURCES)
-+DIST_SOURCES = $(am__libdbmail_la_SOURCES_DIST) \
-+	$(dbmail_imapd_SOURCES) $(dbmail_lmtpd_SOURCES) \
-+	$(dbmail_pop3d_SOURCES) $(am__dbmail_sievecmd_SOURCES_DIST) \
-+	$(dbmail_smtp_SOURCES) $(am__dbmail_timsieved_SOURCES_DIST) \
-+	$(dbmail_users_SOURCES) $(dbmail_util_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,343 +242,318 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- SUBDIRS = mysql pgsql auth sort man
--
- @SIEVE_TRUE@SIEVEPROGS = dbmail-sievecmd dbmail-timsieved
--
- @USE_DM_GETOPT_TRUE@DM_GETOPT = dm_getopt.c
--
--bin_PROGRAMS = $(SIEVEPROGS)
--sbin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-util dbmail-users dbmail-lmtpd 
--
- COMMON = config.c debug.c list.c dbmd5.c md5.c db.c misc.c mime.c pidfile.c $(DM_GETOPT)
- SERVER = server.c serverchild.c pool.c
- DELIVER = header.c pipe.c forward.c dsn.c
- 
- # CFLAGS
- AM_CFLAGS = -fomit-frame-pointer
--
- dbmail_smtp_SOURCES = main.c
--dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@
--
-+dbmail_smtp_LDADD = libdbmail.la
- dbmail_pop3d_SOURCES = pop3.c pop3d.c
--dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_pop3d_LDADD = libdbmail.la
- dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c
--dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ 
--
-+dbmail_imapd_LDADD = libdbmail.la
- dbmail_util_SOURCES = maintenance.c
--dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_util_LDADD = libdbmail.la
- dbmail_users_SOURCES = user.c
--dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_users_LDADD = libdbmail.la
- dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
--dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_lmtpd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_sievecmd_SOURCES = sievecmd.c 
--@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_timsieved_SOURCES = timsieve.c timsieved.c
--@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
--lib_LTLIBRARIES = libdbmail.la
-+@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la
-+noinst_LTLIBRARIES = libdbmail.la
- libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER)
--libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(lib_LTLIBRARIES)
-+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libdbmail_la_LDFLAGS = 
--libdbmail_la_DEPENDENCIES = 
--@USE_DM_GETOPT_FALSE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_FALSE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_FALSE@server.lo serverchild.lo pool.lo header.lo pipe.lo \
--@USE_DM_GETOPT_FALSE@forward.lo dsn.lo
--@USE_DM_GETOPT_TRUE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_TRUE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_TRUE@dm_getopt.lo server.lo serverchild.lo pool.lo \
--@USE_DM_GETOPT_TRUE@header.lo pipe.lo forward.lo dsn.lo
--@SIEVE_FALSE@bin_PROGRAMS = 
--@SIEVE_TRUE@bin_PROGRAMS =  dbmail-sievecmd$(EXEEXT) \
--@SIEVE_TRUE@dbmail-timsieved$(EXEEXT)
--sbin_PROGRAMS =  dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
--dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) dbmail-users$(EXEEXT) \
--dbmail-lmtpd$(EXEEXT)
--PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
--
--@SIEVE_TRUE@dbmail_sievecmd_OBJECTS =  sievecmd.$(OBJEXT)
--@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES =  libdbmail.la
--dbmail_sievecmd_LDFLAGS = 
--@SIEVE_TRUE@dbmail_timsieved_OBJECTS =  timsieve.$(OBJEXT) \
--@SIEVE_TRUE@timsieved.$(OBJEXT)
--@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES =  libdbmail.la
--dbmail_timsieved_LDFLAGS = 
--dbmail_smtp_OBJECTS =  main.$(OBJEXT)
--dbmail_smtp_DEPENDENCIES =  libdbmail.la
--dbmail_smtp_LDFLAGS = 
--dbmail_pop3d_OBJECTS =  pop3.$(OBJEXT) pop3d.$(OBJEXT)
--dbmail_pop3d_DEPENDENCIES =  libdbmail.la
--dbmail_pop3d_LDFLAGS = 
--dbmail_imapd_OBJECTS =  quota.$(OBJEXT) imap4.$(OBJEXT) \
--imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
--rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) dbmsgbuf.$(OBJEXT) \
--acl.$(OBJEXT)
--dbmail_imapd_DEPENDENCIES =  libdbmail.la
--dbmail_imapd_LDFLAGS = 
--dbmail_util_OBJECTS =  maintenance.$(OBJEXT)
--dbmail_util_DEPENDENCIES =  libdbmail.la
--dbmail_util_LDFLAGS = 
--dbmail_users_OBJECTS =  user.$(OBJEXT)
--dbmail_users_DEPENDENCIES =  libdbmail.la
--dbmail_users_LDFLAGS = 
--dbmail_lmtpd_OBJECTS =  lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
--dbmail_lmtpd_DEPENDENCIES =  libdbmail.la
--dbmail_lmtpd_LDFLAGS = 
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
--Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \
--config.in configure configure.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/acl.P .deps/config.P .deps/db.P .deps/dbmd5.P \
--.deps/dbmsgbuf.P .deps/dbsearch.P .deps/debug.P .deps/dm_getopt.P \
--.deps/dsn.P .deps/forward.P .deps/header.P .deps/imap4.P \
--.deps/imapcommands.P .deps/imapd.P .deps/imaputil.P .deps/list.P \
--.deps/lmtp.P .deps/lmtpd.P .deps/main.P .deps/maintenance.P .deps/md5.P \
--.deps/memblock.P .deps/mime.P .deps/misc.P .deps/pidfile.P .deps/pipe.P \
--.deps/pool.P .deps/pop3.P .deps/pop3d.P .deps/quota.P .deps/rfcmsg.P \
--.deps/server.P .deps/serverchild.P .deps/sievecmd.P .deps/timsieve.P \
--.deps/timsieved.P .deps/user.P
--SOURCES = $(libdbmail_la_SOURCES) $(dbmail_sievecmd_SOURCES) $(dbmail_timsieved_SOURCES) $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_util_SOURCES) $(dbmail_users_SOURCES) $(dbmail_lmtpd_SOURCES)
--OBJECTS = $(libdbmail_la_OBJECTS) $(dbmail_sievecmd_OBJECTS) $(dbmail_timsieved_OBJECTS) $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_util_OBJECTS) $(dbmail_users_OBJECTS) $(dbmail_lmtpd_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-+.SUFFIXES: .c .lo .o .obj
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
- 
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
--config.h: stamp-h
-+config.h: stamp-h1
- 	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) stamp-h1; \
- 	else :; fi
--stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+
-+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+	rm -f stamp-h1
-+	touch $@
- 
--mostlyclean-hdr:
--
--clean-hdr:
--
- distclean-hdr:
--	-rm -f config.h
-+	-rm -f config.h stamp-h1
- 
--maintainer-clean-hdr:
--
--mostlyclean-libLTLIBRARIES:
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--
--distclean-libLTLIBRARIES:
--
--maintainer-clean-libLTLIBRARIES:
--
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
--	  else :; fi; \
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
- 	done
--
--uninstall-libLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--	done
--
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
--
--mostlyclean-compile:
--	-rm -f *.o core *.core
--	-rm -f *.$(OBJEXT)
--
--clean-compile:
--
--distclean-compile:
--	-rm -f *.tab.c
--
--maintainer-clean-compile:
--
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--mostlyclean-libtool:
--	-rm -f *.lo
--
--clean-libtool:
--	-rm -rf .libs _libs
--
--distclean-libtool:
--
--maintainer-clean-libtool:
--
--libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
--
--mostlyclean-binPROGRAMS:
--
--clean-binPROGRAMS:
--	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--
--distclean-binPROGRAMS:
--
--maintainer-clean-binPROGRAMS:
--
-+libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) 
-+	$(LINK)  $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
- 
--mostlyclean-sbinPROGRAMS:
--
--clean-sbinPROGRAMS:
--	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
--
--distclean-sbinPROGRAMS:
--
--maintainer-clean-sbinPROGRAMS:
--
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-sbinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
- 	done
- 
--dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES)
-+clean-sbinPROGRAMS:
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) 
-+	@rm -f dbmail-imapd$(EXEEXT)
-+	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) 
-+	@rm -f dbmail-lmtpd$(EXEEXT)
-+	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) 
-+	@rm -f dbmail-pop3d$(EXEEXT)
-+	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) 
- 	@rm -f dbmail-sievecmd$(EXEEXT)
- 	$(LINK) $(dbmail_sievecmd_LDFLAGS) $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_LDADD) $(LIBS)
--
--dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES)
-+dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) 
-+	@rm -f dbmail-smtp$(EXEEXT)
-+	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) 
- 	@rm -f dbmail-timsieved$(EXEEXT)
- 	$(LINK) $(dbmail_timsieved_LDFLAGS) $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_LDADD) $(LIBS)
-+dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) 
-+	@rm -f dbmail-users$(EXEEXT)
-+	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) 
-+	@rm -f dbmail-util$(EXEEXT)
-+	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
- 
--dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES)
--	@rm -f dbmail-smtp$(EXEEXT)
--	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
- 
--dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES)
--	@rm -f dbmail-pop3d$(EXEEXT)
--	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+distclean-compile:
-+	-rm -f *.tab.c
- 
--dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES)
--	@rm -f dbmail-imapd$(EXEEXT)
--	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmd5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmsgbuf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsearch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dm_getopt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsn.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap4.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapcommands.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaputil.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtpd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maintenance.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblock.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3d.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfcmsg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverchild.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievecmd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieve.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieved.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
- 
--dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES)
--	@rm -f dbmail-util$(EXEEXT)
--	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES)
--	@rm -f dbmail-users$(EXEEXT)
--	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES)
--	@rm -f dbmail-lmtpd$(EXEEXT)
--	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
--
--@SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -463,7 +565,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -471,13 +573,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -487,246 +600,327 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.in $$unique $(LISP))
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
- 
--mostlyclean-tags:
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
--clean-tags:
--
- distclean-tags:
--	-rm -f TAGS ID
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
--maintainer-clean-tags:
--
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
--
--# This target untars the dist file and tries a VPATH configuration.  Then
--# it guarantees that the distribution is self-contained by making another
--# tarfile.
--distcheck: dist
--	-rm -rf $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
--	dc_install_base=`cd $(distdir)/=inst && pwd`; \
--	cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
--	  && $(MAKE) $(AM_MAKEFLAGS) check \
--	  && $(MAKE) $(AM_MAKEFLAGS) install \
--	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist
--	-rm -rf $(distdir)
--	@banner="$(distdir).tar.gz is ready for distribution"; \
--	dashes=`echo "$$banner" | sed s/./=/g`; \
--	echo "$$dashes"; \
--	echo "$$banner"; \
--	echo "$$dashes"
--dist: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
--dist-all: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
- distdir: $(DISTFILES)
--	-rm -rf $(distdir)
-+	$(am__remove_distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	$(mkdir_p) $(distdir)/buildtools
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--	for subdir in $(SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
- 
---include $(DEP_FILES)
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
- 
--mostlyclean-depend:
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
- 
--clean-depend:
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
- 
--distclean-depend:
--	-rm -rf .deps
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-recursive
--dvi-am:
--dvi: dvi-recursive
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--installcheck-am:
--installcheck: installcheck-recursive
--all-recursive-am: config.h
--	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
--		install-sbinPROGRAMS
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
--
--install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
--		uninstall-sbinPROGRAMS
--uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
--all-redirect: all-recursive-am
-+
-+installcheck: installcheck-recursive
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
--		$(DESTDIR)$(sbindir)
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
--		mostlyclean-compile mostlyclean-libtool \
--		mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
--		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
- 
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am
- 
--clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
--		clean-depend clean-generic mostlyclean-am
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-hdr distclean-libtool distclean-tags
- 
--clean: clean-recursive
-+dvi: dvi-recursive
- 
--distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-binPROGRAMS \
--		distclean-sbinPROGRAMS distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-recursive
--	-rm -f config.status
-+html: html-recursive
- 
--maintainer-clean-am:  maintainer-clean-hdr \
--		maintainer-clean-libLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-binPROGRAMS \
--		maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
--		maintainer-clean-depend maintainer-clean-generic \
--		distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
- 
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-recursive
--	-rm -f config.status
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
--clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
--uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
--distclean-compile clean-compile maintainer-clean-compile \
--mostlyclean-libtool distclean-libtool clean-libtool \
--maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
--clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
--install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
--clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
--install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
--install-exec-recursive uninstall-exec-recursive installdirs-recursive \
--uninstalldirs-recursive all-recursive check-recursive \
--installcheck-recursive info-recursive dvi-recursive \
--mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck all-recursive-am install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-recursive
- 
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
- 
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-sbinPROGRAMS
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-recursive clean-sbinPROGRAMS \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-compile distclean-generic distclean-hdr \
-+	distclean-libtool distclean-recursive distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-sbinPROGRAMS \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am uninstall-sbinPROGRAMS
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- man/Makefile.in	(revision 1905)
-+++ man/Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -26,88 +30,116 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = man
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-+man8dir = $(mandir)/man8
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,41 +147,105 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 \
-+	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
- 
--man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
-+all: all-am
- 
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--man1dir = $(mandir)/man1
--man8dir = $(mandir)/man8
--MANS = $(man_MANS)
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  man/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
- 
--NROFF = nroff
--DIST_COMMON =  Makefile.am Makefile.in
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+mostlyclean-libtool:
-+	-rm -f *.lo
- 
--TAR = tar
--GZIP_ENV = --best
--all: all-redirect
--.SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
-+clean-libtool:
-+	-rm -rf .libs _libs
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--install-man1:
--	$(mkinstalldirs) $(DESTDIR)$(man1dir)
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-man1: $(man1_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -158,31 +254,43 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
- uninstall-man1:
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
--install-man8:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir)
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+install-man8: $(man8_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -191,120 +299,161 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--
- uninstall-man8:
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--install-man: $(MANS)
--	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man8
--uninstall-man:
--	@$(NORMAL_UNINSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man8
- tags: TAGS
- TAGS:
- 
-+ctags: CTAGS
-+CTAGS:
- 
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
--subdir = man
--
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
-+all-am: Makefile $(MANS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am: install-man
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-man
--uninstall: uninstall-am
--all-am: Makefile $(MANS)
--all-redirect: all-am
-+
-+installcheck: installcheck-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man8
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool mostlyclean-am
- 
--clean-am:  clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
- 
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man: install-man1 install-man8
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: install-man1 uninstall-man1 install-man8 uninstall-man8 \
--install-man uninstall-man tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-am
- 
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-man
-+
-+uninstall-man: uninstall-man1 uninstall-man8
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-man8 install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-man uninstall-man1 uninstall-man8
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- configure.in	(revision 1905)
-+++ configure.in	(revision 1948)
-@@ -19,7 +19,6 @@
- AC_INIT(main.c)
- AC_CONFIG_AUX_DIR(buildtools)
- AM_CONFIG_HEADER(config.h:config.in)
--DBMAIL_MSG_CONFIGURE_START
- AM_INIT_AUTOMAKE(dbmail, 2.0.7)
- AM_MAINTAINER_MODE
- 
---- ChangeLog	(revision 1905)
-+++ ChangeLog	(revision 1948)
-@@ -1,3 +1,46 @@
-+2005-12-22  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog:
-+	blah
-+	* imapcommands.c, imaputil.c:
-+	resync git tree
-+	* ChangeLog:
-+	Merge with /home/paul/git/dbmail-2.0
-+commit d97cef746efa52603fc423759bfe216b53859321
-+tree 32074d5cac257cf2b30ed48979ca88050441e4c7
-+parent 8c598295ff66c378785b2187f6923c99b5df2a6f
-+author Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+committer Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+	* ChangeLog:
-+	blah
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	update mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/po/es.po:
-+	adding spanish translation of debconf files
-+	* INSTALL, INSTALL.dbmail, Makefile.in, acinclude.m4, aclocal.m4, 
-+	  auth/Makefile.in, buildtools/install-sh, buildtools/ltmain.sh, 
-+	  buildtools/missing, buildtools/mkinstalldirs, configure, 
-+	  configure.in, debian/control, debian/rules, man/Makefile.in, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	cleanup autotools chain a bit
-+	* main.c:
-+	remove redeclaration of global dsnuser (closes: #281)
-+	* INSTALL, Makefile.in, auth/Makefile.in, buildtools/depcomp, debian/rules, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	updated autotools for autoconf-1.9
-+
-+2005-10-26  Paul J Stevens <paul@nfg.nl>
-+
-+	* dsn.c, main.c, server.c, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	resync tree
-+	* imapcommands.c, imaputil.c:
-+	initialize struct tm values before calling strptime (closes: #277)
-+
- 2005-10-18  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, auth/authsql.c, dsn.c, main.c:
---- buildtools/depcomp	(revision 0)
-+++ buildtools/depcomp	(revision 1948)
-@@ -0,0 +1,530 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-
---- buildtools/missing	(revision 1905)
-+++ buildtools/missing	(revision 1948)
-@@ -1,8 +1,12 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
--# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
- 
-+scriptversion=2005-06-08.21
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
-@@ -15,15 +19,47 @@
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- 
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
- if test $# -eq 0; then
-   echo 1>&2 "Try \`$0 --help' for more information"
-   exit 1
- fi
- 
-+run=:
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
- case "$1" in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -35,6 +71,7 @@
- Options:
-   -h, --help      display this help and exit
-   -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
- 
- Supported PROGRAM values:
-   aclocal      touch file \`aclocal.m4'
-@@ -43,13 +80,19 @@
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-   lex          create \`lex.yy.c', if possible, from existing .c
-   makeinfo     touch the output file
--  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
-     ;;
- 
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--    echo "missing - GNU libit 0.0"
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -58,10 +101,45 @@
-     exit 1
-     ;;
- 
--  aclocal)
-+esac
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+  lex|yacc)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+  aclocal*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-          to install the \`Automake' and \`Perl' packages.  Grab them from
-          any GNU archive site."
-     touch aclocal.m4
-@@ -69,8 +147,8 @@
- 
-   autoconf)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`configure.in'.  You might want to install the
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-          archive site."
-     touch configure
-@@ -78,11 +156,11 @@
- 
-   autoheader)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acconfig.h' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-          from any GNU archive site."
--    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
-@@ -95,10 +173,10 @@
-     touch $touch_files
-     ;;
- 
--  automake)
-+  automake*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-          You might want to install the \`Automake' and \`Perl' packages.
-          Grab them from any GNU archive site."
-     find . -type f -name Makefile.am -print |
-@@ -106,9 +184,32 @@
- 	   while read f; do touch "$f"; done
-     ;;
- 
-+  autom4te)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-   bison|yacc)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-@@ -138,7 +239,7 @@
- 
-   lex|flex)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-@@ -159,28 +260,90 @@
-     fi
-     ;;
- 
-+  help2man)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+    fi
-+    if [ -f "$file" ]; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit 1
-+    fi
-+    ;;
-+
-   makeinfo)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-          indirectly affecting the aspect of the manual.  The spurious
-          call might also be the consequence of using a buggy \`make' (AIX,
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-     if test -z "$file"; then
--      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
-+  tar)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case "$firstarg" in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case "$firstarg" in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-   *)
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-@@ -188,3 +351,10 @@
- esac
- 
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/install-sh	(revision 1905)
-+++ buildtools/install-sh	(revision 1948)
-@@ -1,20 +1,39 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-05-14.22
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# Copyright (C) 1994 X Consortium
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
- #
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
- # when there is no Makefile.
-@@ -23,13 +42,11 @@
- # from scratch.  It can only install one file at a time, a restriction
- # shared with many OS's install programs.
- 
--
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
- 
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
- 
- mvprog="${MVPROG-mv}"
-@@ -41,211 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
- 
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd="$cpprog"
--	    shift
--	    continue;;
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--	-d) dir_arg=true
--	    shift
--	    continue;;
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
- 
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
- 
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
- 
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
- 
--	-s) stripcmd="$stripprog"
--	    shift
--	    continue;;
-+    -d) dir_arg=true
-+        shift
-+        continue;;
- 
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
-+    --help) echo "$usage"; exit $?;;
- 
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$src" = x ]
--then
--	echo "install:	no input file specified"
--	exit 1
--else
--	true
--fi
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--	
--	if [ -d $dst ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=mkdir
--	fi
--else
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad 
--# if $src (and thus $dsttmp) contains '*'.
-+    -t) dstarg=$2
-+	shift
-+	shift
-+	continue;;
- 
--	if [ -f $src -o -d $src ]
--	then
--		true
--	else
--		echo "install:  $src does not exist"
--		exit 1
--	fi
--	
--	if [ x"$dst" = x ]
--	then
--		echo "install:	no destination specified"
--		exit 1
--	else
--		true
--	fi
-+    -T) no_target_directory=true
-+	shift
-+	continue;;
- 
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	if [ -d $dst ]
--	then
--		dst="$dst"/`basename $src`
--	else
--		true
--	fi
-+    *)  # When -d is used, all remaining arguments are directories to create.
-+	# When -t is used, the destination is already specified.
-+	test -n "$dir_arg$dstarg" && break
-+        # Otherwise, the last argument is the destination.  Remove it from $@.
-+	for arg
-+	do
-+          if test -n "$dstarg"; then
-+	    # $@ is not empty: it contains at least $arg.
-+	    set fnord "$@" "$dstarg"
-+	    shift # fnord
-+	  fi
-+	  shift # arg
-+	  dstarg=$arg
-+	done
-+	break;;
-+  esac
-+done
-+
-+if test -z "$1"; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
- fi
- 
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src ;;
-+  esac
- 
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    src=
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='	
--'
--IFS="${IFS-${defaultIFS}}"
-+    if test -d "$dst"; then
-+      mkdircmd=:
-+      chmodcmd=
-+    else
-+      mkdircmd=$mkdirprog
-+    fi
-+  else
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
- 
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+    if test -z "$dstarg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
- 
--pathcomp=''
-+    dst=$dstarg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst ;;
-+    esac
- 
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
--	shift
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dstarg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dst=$dst/`basename "$src"`
-+    fi
-+  fi
- 
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
-+  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- 
--	pathcomp="${pathcomp}/"
--done
--fi
-+  # Make sure that the destination directory exists.
- 
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
-+  # Skip lots of stat calls in the usual case.
-+  if test ! -d "$dstdir"; then
-+    defaultIFS='
-+	 '
-+    IFS="${IFS-$defaultIFS}"
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
-+    oIFS=$IFS
-+    # Some sh's can't handle IFS=/ for some reason.
-+    IFS='%'
-+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+    shift
-+    IFS=$oIFS
- 
--# If we're going to rename the final executable, determine the name now.
-+    pathcomp=
- 
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
-+    while test $# -ne 0 ; do
-+      pathcomp=$pathcomp$1
-+      shift
-+      if test ! -d "$pathcomp"; then
-+        $mkdirprog "$pathcomp"
-+	# mkdir can fail with a `File exist' error in case several
-+	# install-sh are creating the directory concurrently.  This
-+	# is OK.
-+	test -d "$pathcomp" || exit
-+      fi
-+      pathcomp=$pathcomp/
-+    done
-+  fi
- 
--# don't allow the sed command to completely eliminate the filename
-+  if test -n "$dir_arg"; then
-+    $doit $mkdircmd "$dst" \
-+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
- 
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
-+  else
-+    dstfile=`basename "$dst"`
- 
--# Make a temp file name in the proper directory.
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
- 
--	dsttmp=$dstdir/#inst.$$#
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+    trap '(exit $?); exit' 1 2 13 15
- 
--# Move or copy the file name to the temp name
-+    # Copy the file name to the temp name.
-+    $doit $cpprog "$src" "$dsttmp" &&
- 
--	$doit $instcmd $src $dsttmp &&
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+    # Now rename the file to the real destination.
-+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+      || {
-+	   # The rename failed, perhaps because mv can't rename something else
-+	   # to itself, or perhaps because mv is so ancient that it does not
-+	   # support -f.
- 
--# and set any options; do chmod last to preserve setuid bits
-+	   # Now remove or move aside any old file at destination location.
-+	   # We try this two ways since rm can't unlink itself on some
-+	   # systems and the destination file might be busy for other
-+	   # reasons.  In this case, the final cleanup might fail but the new
-+	   # file should still install successfully.
-+	   {
-+	     if test -f "$dstdir/$dstfile"; then
-+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+	       || {
-+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		 (exit 1); exit 1
-+	       }
-+	     else
-+	       :
-+	     fi
-+	   } &&
- 
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
-+	   # Now rename the file to the real destination.
-+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	 }
-+    }
-+  fi || { (exit 1); exit 1; }
-+done
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+  (exit 0); exit 0
-+}
- 
--# Now rename the file to the real destination.
--
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
--
--fi &&
--
--
--exit 0
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- configure	(revision 1905)
-+++ configure	(revision 1948)
-@@ -278,15 +278,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -463,7 +463,7 @@
- # 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
-+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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1023,8 +1023,10 @@
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-shared[=PKGS]
-                           build shared libraries [default=yes]
-   --enable-static[=PKGS]
-@@ -1526,22 +1528,9 @@
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
--
-           ac_config_headers="$ac_config_headers config.h:config.in"
- 
--          ac_config_commands="$ac_config_commands default-1"
--
--echo "$as_me:$LINENO: result:
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&5
--echo "${ECHO_T}
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&6
--
-+am__api_version="1.9"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -1625,20 +1614,21 @@
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
--echo timestamp > conftestfile
-+echo timestamp > conftest.file
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
--   if test "$*" != "X $srcdir/configure conftestfile" \
--      && test "$*" != "X conftestfile $srcdir/configure"; then
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-       # If neither matched, then we have a broken ls.  This can happen
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-@@ -1651,7 +1641,7 @@
-    { (exit 1); exit 1; }; }
-    fi
- 
--   test "$2" = conftestfile
-+   test "$2" = conftest.file
-    )
- then
-    # Ok.
-@@ -1663,7 +1653,6 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-@@ -1679,6 +1668,92 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$AWK" && break
-+done
-+
- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-@@ -1708,17 +1783,38 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
- 
--PACKAGE=dbmail
--
--VERSION=2.0.7
--
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=dbmail
-+ VERSION=2.0.7
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
- _ACEOF
-@@ -1728,85 +1824,124 @@
- #define VERSION "$VERSION"
- _ACEOF
- 
-+# Some tools Automake needs.
- 
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
- 
--missing_dir=`cd $ac_aux_dir && pwd`
--echo "$as_me:$LINENO: checking for working aclocal" >&5
--echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
- fi
--
--echo "$as_me:$LINENO: checking for working autoconf" >&5
--echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working automake" >&5
--echo $ECHO_N "checking for working automake... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   AUTOMAKE="$missing_dir/missing automake"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
--
--echo "$as_me:$LINENO: checking for working autoheader" >&5
--echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
- else
--   AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working makeinfo" >&5
--echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
--   MAKEINFO=makeinfo
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+  STRIP=$ac_ct_STRIP
- else
--   MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  STRIP="$ac_cv_prog_STRIP"
- fi
- 
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
- 
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
- echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-@@ -1827,6 +1962,7 @@
-   MAINTAINER_MODE_TRUE='#'
-   MAINTAINER_MODE_FALSE=
- fi
-+
-   MAINT=$MAINTAINER_MODE_TRUE
- 
- 
-@@ -2109,6 +2245,71 @@
- echo "${ECHO_T}using SQL authentication" >&6
- fi
- 
-+DEPDIR="${am__leading_dot}deps"
-+
-+          ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+  enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3033,7 +3234,116 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
- 
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
-@@ -5472,6 +5782,115 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
- echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6
- if test -n "$CXX"
-@@ -5684,6 +6103,7 @@
- fi
- 
- 
-+
- if test -n "$MYSQLINC"; then
-   MYSQL_TRUE=
-   MYSQL_FALSE='#'
-@@ -5693,6 +6113,7 @@
- fi
- 
- 
-+
- if test -n "$PGSQLINC"; then
-   PGSQL_TRUE=
-   PGSQL_FALSE='#'
-@@ -5702,6 +6123,7 @@
- fi
- 
- 
-+
- if test -n "$SIEVEINC"; then
-   SIEVE_TRUE=
-   SIEVE_FALSE='#'
-@@ -5711,6 +6133,7 @@
- fi
- 
- 
-+
- if test -n "$LDAPINC"; then
-   LDAP_TRUE=
-   LDAP_FALSE='#'
-@@ -5718,6 +6141,7 @@
-   LDAP_TRUE='#'
-   LDAP_FALSE=
- fi
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-@@ -6409,7 +6833,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6434,10 +6858,10 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- 
- fi
- 
-+SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -6499,7 +6923,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -6533,7 +6957,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -6563,6 +6987,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- 
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -6649,7 +7082,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -6672,13 +7105,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -6694,7 +7127,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -6744,12 +7177,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -6841,7 +7272,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6844 "configure"' > conftest.$ac_ext
-+  echo '#line 7275 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6884,7 +7315,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -7502,7 +7933,121 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--ac_ext=cc
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7732,7 +8277,9 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+fi
- 
-+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7825,7 +8372,7 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:7828:" \
-+echo "$as_me:8375:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8013,11 +8560,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -8063,9 +8637,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -8087,6 +8658,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDGIRSTW]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
-@@ -8118,8 +8696,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -8281,7 +8862,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
-@@ -8301,7 +8882,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8586,6 +9167,17 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -8611,7 +9203,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8673,7 +9265,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8772,6 +9364,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8808,11 +9414,16 @@
-    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works=yes
-+       fi
-      else
-        lt_prog_compiler_static_works=yes
-      fi
-@@ -8854,18 +9465,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8860: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8864: \$? = $ac_status" >&5
-+   echo "$as_me:9475: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -8942,7 +9555,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -8968,6 +9581,16 @@
- 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic='-qnocommon'
-+         lt_prog_compiler_wl='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -8979,7 +9602,7 @@
-       lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9003,12 +9626,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-@@ -9029,9 +9659,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -9053,6 +9688,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic='-pic'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9087,18 +9727,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9097: \$? = $ac_status" >&5
-+   echo "$as_me:9737: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works=yes
-      fi
-    fi
-@@ -9119,7 +9761,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic=
-@@ -9147,23 +9789,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9153: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9795: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9157: \$? = $ac_status" >&5
-+   echo "$as_me:9799: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -9239,6 +9883,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -9259,6 +9913,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -9309,7 +9984,7 @@
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -9327,6 +10002,38 @@
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -9365,32 +10072,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds="$tmp_archive_cmds"
--      fi
--      link_all_deplibs=no
--    else
--      ld_shlibs=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -9401,16 +10082,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9474,7 +10150,7 @@
-       link_all_deplibs=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9495,6 +10171,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9639,7 +10318,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec=' '
- 	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -9653,7 +10332,7 @@
-       ld_shlibs=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
-@@ -9679,52 +10358,52 @@
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
-+      whole_archive_flag_spec=''
-       link_all_deplibs=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -9758,7 +10437,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -9783,7 +10462,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -9792,7 +10471,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -9802,7 +10481,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9869,6 +10548,7 @@
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec='${wl}-E'
-       else
-@@ -9914,7 +10594,7 @@
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9933,10 +10613,12 @@
-     solaris*)
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -9945,8 +10627,18 @@
-       hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs=yes
-       ;;
-@@ -10220,7 +10912,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10248,7 +10940,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -10278,7 +10971,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -10301,7 +10994,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10336,8 +11029,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10355,7 +11057,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -10382,7 +11084,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -10481,7 +11183,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -10556,7 +11258,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -10678,8 +11384,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
-+   test -n "$runpath_var" || \
-+   test "X$hardcode_automatic" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct" != no &&
-@@ -11338,7 +12044,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11341 "configure"
-+#line 12047 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11404,7 +12110,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11436,7 +12142,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11439 "configure"
-+#line 12145 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11502,7 +12208,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11552,7 +12258,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -11565,43 +12271,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
-     ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11731,7 +12400,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -11742,11 +12411,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -11776,7 +12445,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -11852,7 +12527,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -12147,7 +12822,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12184,7 +12861,7 @@
- compiler_lib_search_path_CXX=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -12205,6 +12882,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -12226,8 +12917,17 @@
- CC=${CXX-"c++"}
- compiler=$CC
- compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
-@@ -12297,7 +12997,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -12331,7 +13031,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -12440,7 +13140,7 @@
-     link_all_deplibs_CXX=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.012|aix4.012.*)
-+      case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12461,6 +13161,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -12606,7 +13309,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	whole_archive_flag_spec_CXX=' '
- 	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -12620,6 +13323,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -12643,65 +13347,76 @@
-       ld_shlibs_CXX=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_CXX='-undefined dynamic_lookup'
--            ;;
--        esac
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        ;;
- 
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--  else
--    ld_shlibs_CXX=no
--  fi
--    ;;
--
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -12712,14 +13427,14 @@
- 	;;
-     esac
-     ;;
--  freebsd12*)
-+  freebsd[12]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -12736,11 +13451,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
--    aCC)
-+    aCC*)
-       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -12750,7 +13465,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -12764,7 +13479,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12780,7 +13495,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       hardcode_direct_CXX=no
-       hardcode_shlibpath_var_CXX=no
-@@ -12801,12 +13516,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -12827,7 +13542,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -12845,9 +13560,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12858,7 +13573,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -12871,7 +13586,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12896,17 +13611,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -12937,7 +13676,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -12958,9 +13697,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    ld_shlibs_CXX=no
-+    ;;
-+  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12976,14 +13731,14 @@
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13001,7 +13756,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13020,7 +13775,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -13035,17 +13790,17 @@
- 	# the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13064,7 +13819,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13088,7 +13843,7 @@
-   sco*)
-     archive_cmds_need_lc_CXX=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13100,12 +13855,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13118,36 +13873,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        archive_cmds_need_lc_CXX=yes
- 	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
- 	case $host_os in
--	  solaris2.0-5 | solaris2.0-5.*) ;;
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	link_all_deplibs_CXX=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13155,7 +13907,7 @@
- 	# in the archive.
- 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -13198,7 +13950,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13251,7 +14003,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -13327,6 +14079,20 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+
-+
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13382,7 +14148,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -13407,18 +14173,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13426,22 +14202,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      lt_prog_compiler_pic_CXX='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -13456,7 +14232,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -13467,18 +14243,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13495,7 +14277,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    lt_prog_compiler_pic_CXX='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -13506,14 +14288,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13529,7 +14311,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  *)
-@@ -13538,13 +14320,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    lt_prog_compiler_wl_CXX='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-PIC'
- 	    ;;
-@@ -13554,12 +14336,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13569,7 +14351,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
-@@ -13610,18 +14392,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:13620: \$? = $ac_status" >&5
-+   echo "$as_me:14402: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-@@ -13642,7 +14426,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_CXX=
-@@ -13670,23 +14454,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:13680: \$? = $ac_status" >&5
-+   echo "$as_me:14464: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -13741,7 +14527,7 @@
-     export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     link_all_deplibs_CXX=no
-@@ -13924,7 +14710,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13952,7 +14738,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -13982,7 +14769,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -14005,7 +14792,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14040,8 +14827,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14059,7 +14855,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -14086,7 +14882,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -14185,7 +14981,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -14260,7 +15056,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -14382,8 +15182,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_CXX" != no &&
-@@ -15042,7 +15842,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15045 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15108,7 +15908,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15140,7 +15940,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15143 "configure"
-+#line 15943 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15206,7 +16006,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15358,7 +16158,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -15434,7 +16240,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -15715,13 +16521,36 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -15733,7 +16562,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -15742,7 +16571,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15819,7 +16650,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15845,6 +16676,16 @@
- 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_F77='-qnocommon'
-+         lt_prog_compiler_wl_F77='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -15856,7 +16697,7 @@
-       lt_prog_compiler_wl_F77='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15880,12 +16721,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_F77='-Wl,'
-+	lt_prog_compiler_pic_F77='-fpic'
-+	lt_prog_compiler_static_F77='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-@@ -15906,9 +16754,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_F77='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_F77='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -15930,6 +16783,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -15964,18 +16822,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15970: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15974: \$? = $ac_status" >&5
-+   echo "$as_me:16832: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-@@ -15996,7 +16856,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_F77=
-@@ -16024,23 +16884,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16034: \$? = $ac_status" >&5
-+   echo "$as_me:16894: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_F77=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -16116,6 +16978,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -16136,6 +17008,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_F77=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -16186,7 +17079,7 @@
-       allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=no
-       enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -16200,10 +17093,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_F77=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_F77=no
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16242,32 +17167,6 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_F77="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_F77="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_F77=no
--    else
--      ld_shlibs_F77=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16278,16 +17177,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
-+    if test "$ld_shlibs_F77" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_F77=
-+      export_dynamic_flag_spec_F77=
-+      whole_archive_flag_spec_F77=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16351,7 +17245,7 @@
-       link_all_deplibs_F77=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16372,6 +17266,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -16496,7 +17393,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_F77=' '
- 	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -16510,7 +17407,7 @@
-       ld_shlibs_F77=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
- 
-@@ -16531,57 +17428,57 @@
-       old_archive_From_new_cmds_F77='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_F77=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_F77='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
-+      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_F77=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_F77=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -16615,7 +17512,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -16640,7 +17537,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -16649,7 +17546,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -16659,7 +17556,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16726,6 +17623,7 @@
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_F77='${wl}-E'
-       else
-@@ -16771,7 +17669,7 @@
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16790,10 +17688,12 @@
-     solaris*)
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16802,8 +17702,18 @@
-       hardcode_shlibpath_var_F77=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_F77=yes
-       ;;
-@@ -17077,7 +17987,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17105,7 +18015,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -17135,7 +18046,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17158,7 +18069,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17193,8 +18104,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17212,7 +18132,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -17239,7 +18159,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -17338,7 +18258,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -17413,7 +18333,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -17535,8 +18459,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
-+   test -n "$runpath_var_F77" || \
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_F77" != no &&
-@@ -17713,7 +18637,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -17789,7 +18719,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -18027,7 +18957,7 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
-@@ -18038,16 +18968,42 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- compiler_GCJ=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- archive_cmds_need_lc_GCJ=no
- 
-+old_archive_cmds_GCJ=$old_archive_cmds
- 
-+
- lt_prog_compiler_no_builtin_flag_GCJ=
- 
- if test "$GCC" = yes; then
-@@ -18069,18 +19025,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18075: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19031: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18079: \$? = $ac_status" >&5
-+   echo "$as_me:19035: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -18157,7 +19115,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18183,6 +19141,16 @@
- 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18194,7 +19162,7 @@
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18218,12 +19186,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-fpic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-@@ -18244,9 +19219,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_GCJ='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -18268,6 +19248,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_GCJ='-pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18302,18 +19287,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19293: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18312: \$? = $ac_status" >&5
-+   echo "$as_me:19297: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-@@ -18334,7 +19321,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_GCJ=
-@@ -18362,23 +19349,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18368: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19355: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18372: \$? = $ac_status" >&5
-+   echo "$as_me:19359: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_GCJ=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -18454,6 +19443,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -18474,6 +19473,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -18524,7 +19544,7 @@
-       allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=no
-       enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -18538,10 +19558,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_GCJ=no
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18580,32 +19632,6 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_GCJ="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_GCJ=no
--    else
--      ld_shlibs_GCJ=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18616,16 +19642,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_GCJ" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--      fi
-+    if test "$ld_shlibs_GCJ" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_GCJ=
-+      export_dynamic_flag_spec_GCJ=
-+      whole_archive_flag_spec_GCJ=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18689,7 +19710,7 @@
-       link_all_deplibs_GCJ=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18710,6 +19731,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -18854,7 +19878,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_GCJ=' '
- 	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -18868,7 +19892,7 @@
-       ld_shlibs_GCJ=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
- 
-@@ -18889,57 +19913,57 @@
-       old_archive_From_new_cmds_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_GCJ=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_GCJ=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_GCJ=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_GCJ=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -18973,7 +19997,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -18998,7 +20022,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -19007,7 +20031,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -19017,7 +20041,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19084,6 +20108,7 @@
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-@@ -19129,7 +20154,7 @@
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19148,10 +20173,12 @@
-     solaris*)
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19160,8 +20187,18 @@
-       hardcode_shlibpath_var_GCJ=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_GCJ=yes
-       ;;
-@@ -19435,7 +20472,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19463,7 +20500,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -19493,7 +20531,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -19516,7 +20554,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19551,8 +20589,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19570,7 +20617,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -19597,7 +20644,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -19696,7 +20743,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -19771,7 +20818,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -19893,8 +20944,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var GCJ" || \
--   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-+   test -n "$runpath_var_GCJ" || \
-+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_GCJ" != no &&
-@@ -20553,7 +21604,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20556 "configure"
-+#line 21607 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20619,7 +21670,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20651,7 +21702,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20654 "configure"
-+#line 21705 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20717,7 +21768,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20869,7 +21920,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -20945,7 +22002,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21193,11 +22250,35 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- compiler_RC=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
- lt_cv_prog_compiler_c_o_RC=yes
- 
- # The else clause should only fire when bootstrapping the
-@@ -21314,7 +22395,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -21390,7 +22477,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21758,6 +22845,76 @@
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${USE_DM_GETOPT_TRUE}" && test -z "${USE_DM_GETOPT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${MYSQL_TRUE}" && test -z "${MYSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${PGSQL_TRUE}" && test -z "${PGSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${SIEVE_TRUE}" && test -z "${SIEVE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -22191,8 +23348,8 @@
- # INIT-COMMANDS section.
- #
- 
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--
- _ACEOF
- 
- 
-@@ -22208,7 +23365,7 @@
-   "auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES auth/Makefile" ;;
-   "sort/Makefile" ) CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;;
-   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -22298,6 +23455,7 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -22305,7 +23463,17 @@
- s,@AUTOMAKE@,$AUTOMAKE,;t t
- s,@AUTOHEADER@,$AUTOHEADER,;t t
- s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@mkdir_p@,$mkdir_p,;t t
-+s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@am__tar@,$am__tar,;t t
-+s,@am__untar@,$am__untar,;t t
- s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
- s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
- s,@MAINT@,$MAINT,;t t
-@@ -22318,6 +23486,15 @@
- s,@ac_ct_CC@,$ac_ct_CC,;t t
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
-@@ -22359,11 +23536,12 @@
- s,@ac_ct_AR@,$ac_ct_AR,;t t
- s,@RANLIB@,$RANLIB,;t t
- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
- s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@F77@,$F77,;t t
- s,@FFLAGS@,$FFLAGS,;t t
-@@ -22830,7 +24008,29 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
- done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
-+	 X$ac_file : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- 
-@@ -22946,7 +24146,91 @@
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
- echo "$as_me: executing $ac_dest commands" >&6;}
-   case $ac_dest in
--    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
-+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    { if $as_mkdir_p; then
-+    mkdir -p $dirpart/$fdir
-+  else
-+    as_dir=$dirpart/$fdir
-+    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 $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
-   esac
- done
- _ACEOF
---- INSTALL.dbmail	(revision 0)
-+++ INSTALL.dbmail	(revision 1948)
-@@ -0,0 +1,210 @@
-+/* $Id: INSTALL 1606 2005-02-23 15:46:03Z paul $ 
-+   (c) 2000-2002 IC&S, The Netherlands */
-+
-+DBMAIL installation
-+===================
-+
-+This file describes the installation of DBMail. To read about extra 
-+features in dbmail you should consult the EXTRAS file.
-+Remember, DBmail is easy to install, as long as you exactly follow
-+these instructions.
-+
-+What do you need?
-+
-+- a working mysql (> 4.0.14) or postgresql installation
-+- a working smtp server (Postfix, Exim, QMail or Sendmail)
-+- the DBMail source (www.dbmail.org)
-+- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
-+  *BSD systems, make sure you install and use 'gmake'. 
-+- development files (libs, scripts and include files) for your database
-+  server. These will probably be provided by separate packages.
-+    
-+
-+1.	Setup a database
-+
-+	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
-+	MySQL is supported from version 4.0.14 upwards. Earlier versions of
-+	MySQL lack some SQL features that are needed for DBMail, like support
-+	for the INSERT...SELECT statement.
-+
-+	Mysql setup
-+	-----------
-+
-+	Note: Since some DBMail tables can get VERY large (depending on your
-+	mailusage) we advise using InnoDB as database storage backend.
-+	
-+	First you'll need to create the DBMail database in MYSQL. You can
-+	do this by issueing the following command. This step is only
-+	necessary when you do not have a database for DBMail yet. Note that
-+	you will be prompted for the MySQL root password.
-+
-+	mysqladmin create dbmail -u root -p
-+
-+	This creates a database with the name "dbmail". Now you have to give
-+	a non-root user access to this database. Start the MySQL command-line
-+	client as root:
-+
-+	mysql -u root -p 
-+
-+	and enter the following command:
-+
-+	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+
-+	Where <pass> should be replaced with the password you want for
-+	the dbmail user. After this step, the database is ready to be
-+	used by the dbmail user. The next step is the creation of the
-+	database tables used by DBMail. Log out of the MySQL client and run 
-+	the following command from the command line. You will have to
-+	enter the password you set in the previous step.
-+
-+	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+
-+	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
-+	create_tables.mysql. This is not recommended though. In future
-+	versions, DBMail will only support MySQL with transaction support,
-+	which is only given by InnoDB at the moment.
-+	
-+	After this, the DBMAIL tables will have been created and we can go
-+	on to the compilation and installation of DBMail itself.
-+
-+	Postgresql setup
-+	----------------
-+	
-+	First you need to create the postgresql user dbmail is going to use.
-+	This is done by. Note that this command can only be performed by
-+	user postgres or another PostgreSQL user with the privileges to
-+	create users and and databases.
-+
-+	createuser -U postgres dbmail
-+
-+	Off course you can use an other username than dbmail, simply replace
-+	it. You can set a password for the user by doing a:
-+
-+	ALTER USER dbmail WITH PASSWORD '<password>';
-+
-+	In a postgresql console, with <password> replaced by the actual 
-+	password you want to use. After doing this you should create the
-+	database for dbmail:
-+
-+	createdb -U dbmail dbmail
-+
-+	The first dbmail is the user you just created, the second the name of
-+	the database.  Of course you can use an other databasename. After
-+	setting up the user and database it's time to create the tables, do a:
-+
-+	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+
-+	Don't forget to start postgresql with the -i option, so it accepts
-+	TCP/IP connections.
-+
-+2. 	Set the database settings
-+
-+	Copy the dbmail.conf file to /etc
-+	Edit the dbmail.conf file and set everything in there
-+	to your likeings.
-+
-+	Make sure to set your database name, user and host are configured
-+	in dbmail.conf. Other options in the configuration file are 
-+	documented there.
-+
-+3.	Run configure & make
-+	Run the configure script. This script uses pg_config or mysql_config
-+	(depending on --with-mysql or --with-pgsql) to detect where the
-+	libraries and include files for these databases are.
-+
-+	e.g. when working with PostgreSQL, this is the configure command:
-+
-+	./configure --with-pgsql
-+
-+	After running configure, 'make all' will build the executables.
-+	
-+	Running 'make install' will install the executables in /usr/local/sbin
-+
-+4.	Create users in the dbmail system
-+
-+	Next you will need to create some users into the dbmail mailing sytem.
-+	Currently this can be done in two ways. One way is using the
-+	dbmail-users utility. The other way is doing it in the database
-+	itself. To do it using the dbmail-users utility and do the following:
-+
-+	dbmail-users -a <username> -w <password> -g <clientid>\
-+	             -m <maxmail> [-s aliases]
-+	
-+	clientid can be left 0 (this is if you want certain mailadministrators
-+	administer specific groups of mailusers). maxmail is the maximum
-+	number of bytes this user may have in his/her mailboxes. 0 is
-+	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
-+	number of aliases for this user. @domain are domain aliases. 
-+	A user always needs to have at least one alias to receive mail, unless
-+	the users username is something like foo@bar.org, where bar.org is 
-+	a domain the mailserver deliveres to.
-+	
-+	example: 
-+	./dbmail-users -a john -w secret -g 0 -m 25M\
-+	               -s john@dude.org john@dude.net @net.com
-+	
-+	This will create a user john, with a password secret. It will set
-+	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
-+	and @net.com will be sent to john. The @net.com is a fallback alias.
-+	This means that all mail that cannot be delivered to an existing alias
-+	for a @net.com address will sent to john.
-+
-+5.	Configure your MTA 
-+
-+	There are two ways to connect your MTA to DBMail. The MTA can start a
-+	dbmail-smtp process and pipe SMTP commands and messages to it, or it
-+	can use lmtp (Local Mail Transport Protocol) to deliver via
-+	dbmail-lmtpd. LMTP is the preferred solution because it offers more
-+	robust error handling and because it is a daemon, high traffic servers
-+	will have reduced delays which would be incurred starting up a
-+	dbmail-smtp process for each message.
-+
-+	The specifics of delivering to DBMail from your MTA can be found in
-+	the INSTALL.<MTA Name> files. Currently there is documentation for
-+	Postfix and Exim.
-+
-+	If you use a different kind of mta that we do not have documentation
-+	for: The dbmail injector program, dbmail-smtp, can receive information
-+	in two ways. Either through raw mail (for example, delivered by
-+	procmail) using the -n option or from a MTA with recipients in the
-+	commandline using the -d option. Be carefull, the -n option is not
-+	fully tested and may behave unexected. If possible use the -d option.
-+
-+	Setup for LMTP should be straightforward if your MTA supports it.
-+
-+6.	Setting up the maintenance run
-+
-+	The dbmail daemons and the smtp injector itself will never actually
-+	delete mail from the database. The only program that will do this is
-+	the dbmail-util program. This program will also check the
-+	integrity of the dbmail database and, if nescessary, fix it. The
-+	dbmail-util program will first delete all messages that are set
-+	for final deletion. After that it will set all messages that have the
-+	delete status set to status final deletion. This way dbmail always
-+	has a backup based upon the interval difference between maintenance
-+	jobs. We recommend running the dbmail-util program in a daily
-+	interval from cron:
-+
-+	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
-+	
-+7.	Starting the servers
-+
-+	If you want users to be able to retrieve email via IMAP or POP3, run
-+	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
-+	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+
-+8.	Problems
-+	--------
-+	For problems you can subscribe to the dbmail mailinglist: 
-+	http://mailman.fastxs.nl/mailman/listinfo/dbmail
-+	
-+	Please always check the archives first.
-+
-+	or check out the dbmail website at http://www.dbmail.org.
-+
-+	Please note that DBMail logs a lot of relevant data to the maillog
-+	(often located at /var/log/maillog or /var/log/mail.log). This can
-+	help you often if something is not working, e.g. if there's no
-+	connection to the database.  
-+
-+
---- INSTALL	(revision 1905)
-+++ INSTALL	(revision 1948)
-@@ -1,210 +1,236 @@
--/* $Id$ 
--   (c) 2000-2002 IC&S, The Netherlands */
-+Installation Instructions
-+*************************
- 
--DBMAIL installation
--===================
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-+Software Foundation, Inc.
- 
--This file describes the installation of DBMail. To read about extra 
--features in dbmail you should consult the EXTRAS file.
--Remember, DBmail is easy to install, as long as you exactly follow
--these instructions.
-+This file is free documentation; the Free Software Foundation gives
-+unlimited permission to copy, distribute and modify it.
- 
--What do you need?
-+Basic Installation
-+==================
- 
--- a working mysql (> 4.0.14) or postgresql installation
--- a working smtp server (Postfix, Exim, QMail or Sendmail)
--- the DBMail source (www.dbmail.org)
--- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
--  *BSD systems, make sure you install and use 'gmake'. 
--- development files (libs, scripts and include files) for your database
--  server. These will probably be provided by separate packages.
--    
-+These are generic installation instructions.
- 
--1.	Setup a database
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
- 
--	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
--	MySQL is supported from version 4.0.14 upwards. Earlier versions of
--	MySQL lack some SQL features that are needed for DBMail, like support
--	for the INSERT...SELECT statement.
-+   It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring.  (Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.)
- 
--	Mysql setup
--	-----------
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
- 
--	Note: Since some DBMail tables can get VERY large (depending on your
--	mailusage) we advise using InnoDB as database storage backend.
--	
--	First you'll need to create the DBMail database in MYSQL. You can
--	do this by issueing the following command. This step is only
--	necessary when you do not have a database for DBMail yet. Note that
--	you will be prompted for the MySQL root password.
-+   The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'.  You only need
-+`configure.ac' if you want to change it or regenerate `configure' using
-+a newer version of `autoconf'.
- 
--	mysqladmin create dbmail -u root -p
-+The simplest way to compile this package is:
- 
--	This creates a database with the name "dbmail". Now you have to give
--	a non-root user access to this database. Start the MySQL command-line
--	client as root:
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
- 
--	mysql -u root -p 
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
- 
--	and enter the following command:
-+  2. Type `make' to compile the package.
- 
--	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
- 
--	Where <pass> should be replaced with the password you want for
--	the dbmail user. After this step, the database is ready to be
--	used by the dbmail user. The next step is the creation of the
--	database tables used by DBMail. Log out of the MySQL client and run 
--	the following command from the command line. You will have to
--	enter the password you set in the previous step.
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
- 
--	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
- 
--	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
--	create_tables.mysql. This is not recommended though. In future
--	versions, DBMail will only support MySQL with transaction support,
--	which is only given by InnoDB at the moment.
--	
--	After this, the DBMAIL tables will have been created and we can go
--	on to the compilation and installation of DBMail itself.
-+Compilers and Options
-+=====================
- 
--	Postgresql setup
--	----------------
--	
--	First you need to create the postgresql user dbmail is going to use.
--	This is done by. Note that this command can only be performed by
--	user postgres or another PostgreSQL user with the privileges to
--	create users and and databases.
-+Some systems require unusual options for compilation or linking that the
-+`configure' script does not know about.  Run `./configure --help' for
-+details on some of the pertinent environment variables.
- 
--	createuser -U postgres dbmail
-+   You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment.  Here
-+is an example:
- 
--	Off course you can use an other username than dbmail, simply replace
--	it. You can set a password for the user by doing a:
-+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
- 
--	ALTER USER dbmail WITH PASSWORD '<password>';
-+   *Note Defining Variables::, for more details.
- 
--	In a postgresql console, with <password> replaced by the actual 
--	password you want to use. After doing this you should create the
--	database for dbmail:
-+Compiling For Multiple Architectures
-+====================================
- 
--	createdb -U dbmail dbmail
-+You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
- 
--	The first dbmail is the user you just created, the second the name of
--	the database.  Of course you can use an other databasename. After
--	setting up the user and database it's time to create the tables, do a:
-+   If you have to use a `make' that does not support the `VPATH'
-+variable, you have to compile the package for one architecture at a
-+time in the source code directory.  After you have installed the
-+package for one architecture, use `make distclean' before reconfiguring
-+for another architecture.
- 
--	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+Installation Names
-+==================
- 
--	Don't forget to start postgresql with the -i option, so it accepts
--	TCP/IP connections.
-+By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
- 
--2. 	Set the database settings
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
- 
--	Copy the dbmail.conf file to /etc
--	Edit the dbmail.conf file and set everything in there
--	to your likeings.
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
- 
--	Make sure to set your database name, user and host are configured
--	in dbmail.conf. Other options in the configuration file are 
--	documented there.
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
- 
--3.	Run configure & make
--	Run the configure script. This script uses pg_config or mysql_config
--	(depending on --with-mysql or --with-pgsql) to detect where the
--	libraries and include files for these databases are.
-+Optional Features
-+=================
- 
--	e.g. when working with PostgreSQL, this is the configure command:
-+Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
- 
--	./configure --with-pgsql
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
- 
--	After running configure, 'make all' will build the executables.
--	
--	Running 'make install' will install the executables in /usr/local/sbin
-+Specifying the System Type
-+==========================
- 
--4.	Create users in the dbmail system
-+There may be some features `configure' cannot figure out automatically,
-+but needs to determine by the type of machine the package will run on.
-+Usually, assuming the package is built to be run on the _same_
-+architectures, `configure' can figure that out, but if it prints a
-+message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
- 
--	Next you will need to create some users into the dbmail mailing sytem.
--	Currently this can be done in two ways. One way is using the
--	dbmail-users utility. The other way is doing it in the database
--	itself. To do it using the dbmail-users utility and do the following:
-+     CPU-COMPANY-SYSTEM
- 
--	dbmail-users -a <username> -w <password> -g <clientid>\
--	             -m <maxmail> [-s aliases]
--	
--	clientid can be left 0 (this is if you want certain mailadministrators
--	administer specific groups of mailusers). maxmail is the maximum
--	number of bytes this user may have in his/her mailboxes. 0 is
--	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
--	number of aliases for this user. @domain are domain aliases. 
--	A user always needs to have at least one alias to receive mail, unless
--	the users username is something like foo@bar.org, where bar.org is 
--	a domain the mailserver deliveres to.
--	
--	example: 
--	./dbmail-users -a john -w secret -g 0 -m 25M\
--	               -s john@dude.org john@dude.net @net.com
--	
--	This will create a user john, with a password secret. It will set
--	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
--	and @net.com will be sent to john. The @net.com is a fallback alias.
--	This means that all mail that cannot be delivered to an existing alias
--	for a @net.com address will sent to john.
-+where SYSTEM can have one of these forms:
- 
--5.	Configure your MTA 
-+     OS KERNEL-OS
- 
--	There are two ways to connect your MTA to DBMail. The MTA can start a
--	dbmail-smtp process and pipe SMTP commands and messages to it, or it
--	can use lmtp (Local Mail Transport Protocol) to deliver via
--	dbmail-lmtpd. LMTP is the preferred solution because it offers more
--	robust error handling and because it is a daemon, high traffic servers
--	will have reduced delays which would be incurred starting up a
--	dbmail-smtp process for each message.
-+   See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
- 
--	The specifics of delivering to DBMail from your MTA can be found in
--	the INSTALL.<MTA Name> files. Currently there is documentation for
--	Postfix and Exim.
-+   If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
- 
--	If you use a different kind of mta that we do not have documentation
--	for: The dbmail injector program, dbmail-smtp, can receive information
--	in two ways. Either through raw mail (for example, delivered by
--	procmail) using the -n option or from a MTA with recipients in the
--	commandline using the -d option. Be carefull, the -n option is not
--	fully tested and may behave unexected. If possible use the -d option.
-+   If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
- 
--	Setup for LMTP should be straightforward if your MTA supports it.
-+Sharing Defaults
-+================
- 
--6.	Setting up the maintenance run
-+If you want to set default values for `configure' scripts to share, you
-+can create a site shell script called `config.site' that gives default
-+values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
- 
--	The dbmail daemons and the smtp injector itself will never actually
--	delete mail from the database. The only program that will do this is
--	the dbmail-util program. This program will also check the
--	integrity of the dbmail database and, if nescessary, fix it. The
--	dbmail-util program will first delete all messages that are set
--	for final deletion. After that it will set all messages that have the
--	delete status set to status final deletion. This way dbmail always
--	has a backup based upon the interval difference between maintenance
--	jobs. We recommend running the dbmail-util program in a daily
--	interval from cron:
-+Defining Variables
-+==================
- 
--	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
--	
--7.	Starting the servers
-+Variables not defined in a site shell script can be set in the
-+environment passed to `configure'.  However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost.  In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'.  For example:
- 
--	If you want users to be able to retrieve email via IMAP or POP3, run
--	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
--	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+     ./configure CC=/usr/local2/bin/gcc
- 
--8.	Problems
--	--------
--	For problems you can subscribe to the dbmail mailinglist: 
--	http://mailman.fastxs.nl/mailman/listinfo/dbmail
--	
--	Please always check the archives first.
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).  Here is a another example:
- 
--	or check out the dbmail website at http://www.dbmail.org.
-+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
- 
--	Please note that DBMail logs a lot of relevant data to the maillog
--	(often located at /var/log/maillog or /var/log/mail.log). This can
--	help you often if something is not working, e.g. if there's no
--	connection to the database.  
-+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-+configuration-related scripts to be executed by `/bin/bash'.
- 
-+`configure' Invocation
-+======================
- 
-+`configure' recognizes the following options to control how it operates.
-+
-+`--help'
-+`-h'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--version'
-+`-V'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`--cache-file=FILE'
-+     Enable the cache: use and save the results of the tests in FILE,
-+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-+     disable caching.
-+
-+`--config-cache'
-+`-C'
-+     Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`configure' also accepts some other, not widely useful, options.  Run
-+`configure --help' for more details.
-+
---- acinclude.m4	(revision 1905)
-+++ acinclude.m4	(revision 1948)
-@@ -4,138 +4,9 @@
- 
- # serial 1
- 
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
- dnl DBMAIL_BOTH_SQL_CHECK
- dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
-+AC_DEFUN([DBMAIL_BOTH_SQL_CHECK], [dnl
- AC_ARG_WITH(mysql,
-             [  --with-mysql            use MySQL as database. Uses mysql_config
- 	       		  for finding includes and libraries],
-@@ -187,7 +58,7 @@
- 
- dnl DBMAIL_CHECK_SQL_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SQL_LIBS], [dnl
- #Look for include files and libs needed to link
- #use the configuration utilities (mysql_config and pg_config for this)
- # MySQL first
-@@ -231,7 +102,7 @@
- ])
- dnl DBMAIL_SIEVE_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
-+AC_DEFUN([DBMAIL_SIEVE_CONF], [dnl
- AC_MSG_RESULT([checking for sorting configuration])
- AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
- 	sieveheadername="$withval$")
-@@ -287,7 +158,7 @@
- 
- dnl DBMAIL_CHECK_SIEVE_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SIEVE_LIBS], [dnl
- # Look for libs needed to link to SIEVE first
- if test ! "${sieveheadername-x}" = "x"
- then
-@@ -307,7 +178,7 @@
- 	
- dnl DBMAIL_AUTH_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
-+AC_DEFUN([DBMAIL_AUTH_CONF], [dnl
- AC_MSG_RESULT([checking for authentication configuration])
- AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
- 	authldapheadername="$withval$")
-@@ -363,7 +234,7 @@
- 
- dnl DBMAIL_CHECK_LDAP_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_LDAP_LIBS], [dnl
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
diff --git a/mail/dbmail20/files/patch-2.0.7_008 b/mail/dbmail20/files/patch-2.0.7_008
deleted file mode 100644
index ca3e9b671145..000000000000
--- a/mail/dbmail20/files/patch-2.0.7_008
+++ /dev/null
@@ -1,8766 +0,0 @@
---- pgsql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ pgsql/Makefile.in	Mon Dec 26 09:42:29 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,105 +12,140 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
--# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
--#
--# This program is free software; you can redistribute it and/or 
--# modify it under the terms of the GNU General Public License 
--# as published by the Free Software Foundation; either 
--# version 2 of the License, or (at your option) any later 
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
-+@SET_MAKE@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = pgsql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libpgsqldbmail_la_DEPENDENCIES =
-+am__libpgsqldbmail_la_SOURCES_DIST = dbpgsql.c
-+@PGSQL_TRUE@am_libpgsqldbmail_la_OBJECTS = dbpgsql.lo
-+libpgsqldbmail_la_OBJECTS = $(am_libpgsqldbmail_la_OBJECTS)
-+@PGSQL_TRUE@am_libpgsqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgsqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libpgsqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +153,167 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- 
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
-+# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
-+#
-+# This program is free software; you can redistribute it and/or 
-+# modify it under the terms of the GNU General Public License 
-+# as published by the Free Software Foundation; either 
-+# version 2 of the License, or (at your option) any later 
-+# version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- @PGSQL_TRUE@AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer
--
- @PGSQL_TRUE@pkglib_LTLIBRARIES = libpgsqldbmail.la
--
- @PGSQL_TRUE@libpgsqldbmail_la_SOURCES = dbpgsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
-+@PGSQL_TRUE@libpgsqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libpgsqldbmail_la_LDFLAGS = 
--libpgsqldbmail_la_LIBADD = 
--@PGSQL_TRUE@libpgsqldbmail_la_OBJECTS =  dbpgsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbpgsql.P
--SOURCES = $(libpgsqldbmail_la_SOURCES)
--OBJECTS = $(libpgsqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu pgsql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pgsql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  pgsql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libpgsqldbmail_la_rpath) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbpgsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = pgsql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pgsql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- buildtools/mkinstalldirs	Fri Aug 19 14:30:42 2005
-+++ buildtools/mkinstalldirs	Mon Dec 26 09:42:30 2005
-@@ -1,40 +1,158 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 802 2003-10-24 09:21:31Z ilja $
-+scriptversion=2005-06-29.22
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
- 
- errstatus=0
-+dirmode=
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
-+case $dirmode in
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
-+esac
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp"
--
--        mkdir "$pathcomp" || lasterr=$?
--
--        if test ! -d "$pathcomp"; then
--  	  errstatus=$lasterr
--        fi
--     fi
-+for file
-+do
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
--# mkinstalldirs ends here
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/ltmain.sh	Mon Aug 22 12:09:45 2005
-+++ buildtools/ltmain.sh	Mon Dec 26 09:42:30 2005
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -17,7 +17,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -43,9 +43,14 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.6
--TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-+VERSION="1.5.20 Debian 1.5.20-2"
-+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
- 
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
- 
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -83,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  SP2NL='tr \040 \012'
-+  NL2SP='tr \015\012 \040\040'
-   ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+  SP2NL='tr \100 \n'
-+  NL2SP='tr \r\n \100\100'
-   ;;
- esac
- 
-@@ -107,8 +113,9 @@
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   $echo "$modename: not configured to build any kind of library" 1>&2
-@@ -138,7 +145,8 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--func_win32_libid () {
-+func_win32_libid ()
-+{
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-@@ -178,7 +186,8 @@
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- # arg is usually of the form 'gcc ...'
--func_infer_tag () {
-+func_infer_tag ()
-+{
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
-@@ -235,6 +244,108 @@
-       esac
-     fi
- }
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+
-+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
-+}
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    ${rm}r unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd "$darwin_orig_dir"
-+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	fi # $run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+        ;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+    func_extract_archives_result="$my_oldobjs"
-+}
- # End of Shell function definitions
- #####################################
- 
-@@ -305,10 +416,10 @@
-   --version)
-     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-     $echo "This is free software; see the source for copying conditions.  There is NO"
-     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --config)
-@@ -317,7 +428,7 @@
-     for tagname in $taglist; do
-       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-     done
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --debug)
-@@ -342,7 +453,7 @@
-     else
-       $echo "disable static libraries"
-     fi
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -399,7 +510,7 @@
-   # Infer the operation mode.
-   if test -z "$mode"; then
-     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-     case $nonopt in
-     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-@@ -465,7 +576,7 @@
- 
-     for arg
-     do
--      case "$arg_mode" in
-+      case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
-@@ -547,7 +658,10 @@
-       case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
-+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+      # in scan sets (worked around with variable expansion),
-+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-+      # at all, so we specify them separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-@@ -621,6 +735,14 @@
-       esac
-     done
- 
-+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-+    case $qlibobj in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qlibobj="\"$qlibobj\"" ;;
-+    esac
-+    test "X$libobj" != "X$qlibobj" \
-+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-     if test "X$xdir" = "X$obj"; then
-@@ -693,12 +815,17 @@
- 	$run $rm $removelist
- 	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      $echo "$srcfile" > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
-+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-+    case $qsrcfile in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+      qsrcfile="\"$qsrcfile\"" ;;
-+    esac
- 
-     $run $rm "$libobj" "${libobj}T"
- 
-@@ -720,10 +847,10 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
-       if test ! -d "${xdir}$objdir"; then
-@@ -803,9 +930,9 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -1227,6 +1354,13 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        darwin_framework)
-+	  compiler_flags="$compiler_flags $arg"
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
-@@ -1285,6 +1419,14 @@
- 	continue
- 	;;
- 
-+      -framework|-arch)
-+        prev=darwin_framework
-+        compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+        continue
-+        ;;
-+
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -1345,7 +1487,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1356,7 +1498,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1366,8 +1508,20 @@
- 	continue
- 	;;
- 
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      -model)
-+	compile_command="$compile_command $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	finalize_command="$finalize_command $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	deplibs="$deplibs $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
- 	continue
- 	;;
- 
-@@ -1376,13 +1530,14 @@
- 	continue
- 	;;
- 
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m* pass through architecture-specific compiler args for GCC
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1858,7 +2013,7 @@
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    deplibs="$deplib $deplibs"
-+	    compiler_flags="$compiler_flags $deplib"
- 	  fi
- 	  continue
- 	  ;;
-@@ -1977,7 +2132,22 @@
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2051,6 +2221,8 @@
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
-+	avoidtemprpath=
-+
- 
- 	# Read the .la file
- 	case $lib in
-@@ -2149,11 +2321,19 @@
- 	    dir="$libdir"
- 	    absdir="$libdir"
- 	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
-@@ -2226,12 +2406,12 @@
- 	  if test -n "$library_names" &&
- 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath " in
- 	      *" $dir "*) ;;
- 	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      *) temp_rpath="$temp_rpath $absdir" ;;
- 	      esac
- 	    fi
- 
-@@ -2417,7 +2597,7 @@
- 		add_dir="-L$dir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
-+		  case $libdir in
- 		    [\\/]*)
- 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
-@@ -2490,7 +2670,7 @@
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
-+		case $libdir in
- 		  [\\/]*)
- 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
-@@ -2551,8 +2731,6 @@
- 	      fi
- 	    fi
- 	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
-@@ -2670,12 +2848,12 @@
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$depdepl $deplibs" ;;
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
-@@ -2947,7 +3125,7 @@
- 	case $current in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2956,7 +3134,7 @@
- 	case $revision in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2965,7 +3143,7 @@
- 	case $age in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2991,7 +3169,7 @@
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -3197,7 +3375,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -3247,7 +3425,7 @@
- 	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" -ne "0"; then
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3284,7 +3462,7 @@
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
-@@ -3336,7 +3514,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test  "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3405,7 +3583,7 @@
- 	  set dummy $deplibs_check_method
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3646,6 +3824,9 @@
- 	        # The command line is too long to execute in one step.
- 	        $show "using reloadable object file for export list..."
- 	        skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
-@@ -3679,67 +3860,13 @@
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
--
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -3769,7 +3896,8 @@
- 	  fi
- 	fi
- 
--	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" &&
-+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
-@@ -3788,6 +3916,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
-+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -3797,13 +3926,13 @@
- 	  delfiles=
- 	  last_robj=
- 	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
-+	  output=$output_objdir/$output_la-${k}.$objext
- 	  # Loop over the list of objects to be linked.
- 	  for obj in $save_libobjs
- 	  do
- 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- 	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
-+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 		 test "$len" -le "$max_cmd_len"; }; then
- 	      objlist="$objlist $obj"
- 	    else
-@@ -3817,9 +3946,9 @@
- 		# the last one created.
- 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- 	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      last_robj=$output_objdir/$output_la-${k}.$objext
- 	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
-+	      output=$output_objdir/$output_la-${k}.$objext
- 	      objlist=$obj
- 	      len=1
- 	    fi
-@@ -3839,13 +3968,13 @@
- 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
- 
--	  # Set up a command to remove the reloadale object files
-+	  # Set up a command to remove the reloadable object files
- 	  # after they are used.
- 	  i=0
- 	  while test "$i" -lt "$k"
- 	  do
- 	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- 	  done
- 
- 	  $echo "creating a temporary reloadable object file: $output"
-@@ -3893,13 +4022,30 @@
- 	  IFS="$save_ifs"
- 	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
-+	  $run eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      $show "${rm}r $gentop"
-+	      $run ${rm}r "$gentop"
-+	    fi
-+	  fi
-+
- 	  exit $EXIT_SUCCESS
- 	fi
- 
-@@ -3977,64 +4123,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -4296,12 +4388,12 @@
- 
- 	    # Prepare the list of exported symbols
- 	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
-+	      export_symbols="$output_objdir/$outputname.exp"
- 	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
- 	  fi
-@@ -4353,7 +4445,26 @@
- #endif
- 
- /* The mapping between symbol names and symbols. */
-+"
-+
-+	    case $host in
-+	    *cygwin* | *mingw* )
-+	  $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs */
-+struct {
-+"
-+	      ;;
-+	    * )
-+	  $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+	      ;;
-+	    esac
-+
-+
-+	  $echo >> "$output_objdir/$dlsyms" "\
-   const char *name;
-   lt_ptr address;
- }
-@@ -4582,7 +4693,7 @@
- 	esac
- 	case $host in
- 	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- 	    cwrapper=`$echo ${output}.exe`
- 	    $rm $cwrappersource $cwrapper
- 	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-@@ -4681,6 +4792,7 @@
- EOF
- 
- 	    cat >> $cwrappersource <<"EOF"
-+  return 127;
- }
- 
- void *
-@@ -4815,7 +4927,7 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -4944,13 +5056,13 @@
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
- 	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
-@@ -4960,7 +5072,7 @@
-     fi
-   else
-     # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit $EXIT_FAILURE
-@@ -4992,71 +5104,73 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
--	  fi
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-        cmds=$old_archive_from_new_cmds
-       else
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "copying selected object files to avoid basename conflicts..."
-+
-+	  if test -z "$gentop"; then
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	  fi
-+
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		counter=`expr $counter + 1`
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      $run ln "$obj" "$gentop/$newobj" ||
-+	      $run cp "$obj" "$gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	if len=`expr "X$cmds" : ".*"` &&
-@@ -5070,20 +5184,7 @@
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
--	  fi
-+
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
-@@ -5094,7 +5195,7 @@
- 	    oldobjs="$objlist $obj"
- 	    objlist="$objlist $obj"
- 	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
-+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	       test "$len" -le "$max_cmd_len"; then
- 	      :
- 	    else
-@@ -5291,11 +5392,11 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+       $echo "X$nonopt" | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5304,14 +5405,14 @@
-       shift
-     else
-       install_prog=
--      arg="$nonopt"
-+      arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-     case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-     esac
-@@ -5329,28 +5430,31 @@
-     do
-       if test -n "$dest"; then
- 	files="$files $dest"
--	dest="$arg"
-+	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
-+      -f) 
-+      	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o) prev=$arg ;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
--      -*) ;;
--
-+      -*)
-+	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  prev=
- 	else
--	  dest="$arg"
-+	  dest=$arg
- 	  continue
- 	fi
- 	;;
-@@ -5359,7 +5463,7 @@
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5528,11 +5632,14 @@
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- 	      fi
- 	    done
- 	  fi
-@@ -5545,7 +5652,16 @@
- 	    IFS="$save_ifs"
- 	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
-+	    $run eval "$cmd" || {
-+	      lt_exit=$?
-+
-+	      # Restore the uninstalled library and exit
-+	      if test "$mode" = relink; then
-+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	      fi
-+
-+	      exit $lt_exit
-+	    }
- 	  done
- 	  IFS="$save_ifs"
- 	fi
-@@ -5639,17 +5755,15 @@
- 	  notinst_deplibs=
- 	  relink_command=
- 
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
-@@ -5677,17 +5791,15 @@
- 	  done
- 
- 	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  outputname=
-@@ -5728,7 +5840,7 @@
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
-+	# one anyway 
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
-@@ -6398,7 +6510,7 @@
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit $EXIT_SUCCESS
-+exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
---- auth/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ auth/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1404 2004-10-14 09:13:17Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = auth
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libauthdbmail_la_DEPENDENCIES =
-+am__libauthdbmail_la_SOURCES_DIST = authsql.c authldap.c
-+@LDAP_FALSE@am_libauthdbmail_la_OBJECTS = authsql.lo
-+@LDAP_TRUE@am_libauthdbmail_la_OBJECTS = authldap.lo
-+libauthdbmail_la_OBJECTS = $(am_libauthdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libauthdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libauthdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,108 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- AM_CFLAGS = -fomit-frame-pointer
--
- pkglib_LTLIBRARIES = libauthdbmail.la
--@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
- @LDAP_FALSE@libauthdbmail_la_SOURCES = authsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libauthdbmail_la_LDFLAGS = 
--libauthdbmail_la_LIBADD = 
--@LDAP_TRUE@libauthdbmail_la_OBJECTS =  authldap.lo
--@LDAP_FALSE@libauthdbmail_la_OBJECTS =  authsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/authldap.P .deps/authsql.P
--SOURCES = $(libauthdbmail_la_SOURCES)
--OBJECTS = $(libauthdbmail_la_OBJECTS)
-+@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
-+libauthdbmail_la_LIBADD = -lcrypt @LDAPLIB@ @SQLLIB@
-+all: all-am
- 
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu auth/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  auth/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  auth/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldap.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -226,173 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = auth
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu auth/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+pdf-am:
- 
-+ps: ps-am
- 
--#libauthdbmail_la_LIBADD = -lcrypt
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- sort/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ sort/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1535 2004-12-27 09:48:06Z paul $ 
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $ 
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = sort
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libsortdbmail_la_DEPENDENCIES =
-+am__libsortdbmail_la_SOURCES_DIST = sort.c sortsieve.c
-+@SIEVE_FALSE@am_libsortdbmail_la_OBJECTS = sort.lo
-+@SIEVE_TRUE@am_libsortdbmail_la_OBJECTS = sort.lo sortsieve.lo
-+libsortdbmail_la_OBJECTS = $(am_libsortdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libsortdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libsortdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- pkglib_LTLIBRARIES = libsortdbmail.la
--@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_FALSE@libsortdbmail_la_SOURCES = sort.c
-+@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_TRUE@AM_CFLAGS = -DSIEVE
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libsortdbmail_la_LDFLAGS = 
--libsortdbmail_la_LIBADD = 
--@SIEVE_FALSE@libsortdbmail_la_OBJECTS =  sort.lo
--@SIEVE_TRUE@libsortdbmail_la_OBJECTS =  sort.lo sortsieve.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
-+libsortdbmail_la_LIBADD = @SORTLIB@
-+all: all-am
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/sort.P .deps/sortsieve.P
--SOURCES = $(libsortdbmail_la_SOURCES)
--OBJECTS = $(libsortdbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu sort/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sort/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  sort/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortsieve.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = sort
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sort/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- mysql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ mysql/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = mysql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libmysqldbmail_la_DEPENDENCIES =
-+am__libmysqldbmail_la_SOURCES_DIST = dbmysql.c
-+@MYSQL_TRUE@am_libmysqldbmail_la_OBJECTS = dbmysql.lo
-+libmysqldbmail_la_OBJECTS = $(am_libmysqldbmail_la_OBJECTS)
-+@MYSQL_TRUE@am_libmysqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libmysqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libmysqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,149 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- @MYSQL_TRUE@AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer 
--
- @MYSQL_TRUE@pkglib_LTLIBRARIES = libmysqldbmail.la
--
- @MYSQL_TRUE@libmysqldbmail_la_SOURCES = dbmysql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libmysqldbmail_la_LDFLAGS = 
--libmysqldbmail_la_LIBADD = 
--@MYSQL_TRUE@libmysqldbmail_la_OBJECTS =  dbmysql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
-+@MYSQL_TRUE@libmysqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbmysql.P
--SOURCES = $(libmysqldbmail_la_SOURCES)
--OBJECTS = $(libmysqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mysql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  mysql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libmysqldbmail_la_rpath) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmysql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = mysql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- aclocal.m4	Mon Aug 22 12:09:45 2005
-+++ aclocal.m4	Mon Dec 26 09:42:35 2005
-@@ -1,1423 +1,19 @@
--dnl aclocal.m4t generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Do all the work for Automake.  This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
--dnl DBMAIL_BOTH_SQL_CHECK
--dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
--AC_ARG_WITH(mysql,
--            [  --with-mysql            use MySQL as database. Uses mysql_config
--	       		  for finding includes and libraries],
--            mysqlheadername="$withval")
--AC_ARG_WITH(pgsql,
--	    [  --with-pgsql            use PostgreSQL as database. 
--                          Uses pg_config for finding includes and libraries],
--            pgsqlheadername="$withval")
--
--WARN=0
--# Make sure we only select one, mysql or pgsql
--if test "${mysqlheadername-x}" = "x"
--then
--  if test "${pgsqlheadername-x}" = "x"
--  then
--    NEITHER=1
--    mysqlheadername=""
--#    MYSQLINC=""
--#    PGSQLINC=""
--  fi
--fi
--if test "$NEITHER" = 1
--  then
--     AC_MSG_ERROR([
--
--     You have to specify --with-mysql or --with-pgsql to build.
--])
--fi
--
--if test ! "${mysqlheadername-x}" = "x"
--then
--  if test ! "${pgsqlheadername-x}" = "x"
--    then
--      WARN=1
--      mysqlheadername=""
--#      MYSQLINC=""
--#      PGSQLINC=""
--  fi
--fi
--if test "$WARN" = 1
--  then
--     AC_MSG_ERROR([
--
--     You cannot specify both --with-mysql and --with-pgsql on the same
--     build...
--])
--fi
--])
--
--dnl DBMAIL_CHECK_SQL_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
--#Look for include files and libs needed to link
--#use the configuration utilities (mysql_config and pg_config for this)
--# MySQL first
--if test ! "${mysqlheadername-x}" = "x"
--then
--    AC_PATH_PROG(mysqlconfig,mysql_config)
--    if test [ -z "$mysqlconfig" ]
--    then
--        AC_MSG_ERROR([mysql_config executable not found. Make sure mysql_config is in your path])
--    else
--	AC_MSG_CHECKING([MySQL headers])
--	MYSQLINC=`${mysqlconfig} --cflags`
--	AC_MSG_RESULT([$MYSQLINC])	
--        AC_MSG_CHECKING([MySQL libraries])
--        SQLLIB=`${mysqlconfig} --libs`
--        SQLALIB="mysql/.libs/libmysqldbmail.a"
--	SQLLTLIB="mysql/libmysqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--   fi
--else
--  if test ! "${pgsqlheadername-x}" = "x"
--  then
--    AC_PATH_PROG(pgsqlconfig,pg_config)
--    if test [ -z "$pgsqlconfig" ]
--    then
--        AC_MSG_ERROR([pg_config executable not found. Make sure pg_config is in your path])
--    else
--	AC_MSG_CHECKING([PostgreSQL headers])
--	PGINCDIR=`${pgsqlconfig} --includedir`
--	PGSQLINC="-I$PGINCDIR"
--	AC_MSG_RESULT([$PGSQLINC])
--        AC_MSG_CHECKING([PostgreSQL libraries])
--        PGLIBDIR=`${pgsqlconfig} --libdir`
--        SQLLIB="-L$PGLIBDIR -lpq"
--        SQLALIB="pgsql/.libs/libpgsqldbmail.a"
--	SQLLTLIB="pgsql/libpgsqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--    fi
--  fi
--fi
--])
--dnl DBMAIL_SIEVE_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
--AC_MSG_RESULT([checking for sorting configuration])
--AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
--	sieveheadername="$withval$")
--dnl This always needs to be defined
--SORTALIB="sort/.libs/libsortdbmail.a"
--SORTLTLIB="sort/libsortdbmail.la"
--
--WARN=0
--if test ! "${sieveheadername-x}" = "x"
--then
--  # --with-sieve was specified
--  AC_MSG_RESULT([using Sieve sorting])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for sieve2_interface.h (user supplied)])
--    if test -r "$sieveheadername/sieve2_interface.h"
--      then
--      # found
--        AC_MSG_RESULT([$sieveheadername/sieve2_interface.h])
--        SIEVEINC=$sieveheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        SIEVEINC=""
--        sieveheadername=""
--        AC_MSG_ERROR([
--  Unable to find sieve2_inteface.h where you specified, try just --with-sieve to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for sieve2_interface.h])
--    for sievepaths in $sieveheaderpaths
--    do
--      if test -r "$sievepaths/sieve2_interface.h"
--      then
--        SIEVEINC="$sievepaths"
--        AC_MSG_RESULT([$sievepaths/sieve2_interface.h])
--        break
--      fi
--    done
--    if test -z "$SIEVEINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate sieve2_inteface.h, try specifying with --with-sieve])
--    fi
--  fi
--else
--  AC_MSG_RESULT([not using any sorting])
--fi
--])
--
--dnl DBMAIL_CHECK_SIEVE_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
--# Look for libs needed to link to SIEVE first
--if test ! "${sieveheadername-x}" = "x"
--then
--  AC_CHECK_LIB(sieve,sieve2_listextensions,[ SIEVELIB="-lsieve"], [SIEVELIB=""])
--  if test -z "$SIEVELIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against libSieve.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no Sieve needed
--  SIEVELIB=""
--fi
--])
--	
--dnl DBMAIL_AUTH_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
--AC_MSG_RESULT([checking for authentication configuration])
--AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
--	authldapheadername="$withval$")
--dnl This always needs to be defined
--AUTHALIB="auth/.libs/libauthdbmail.a"
--AUTHLTLIB="auth/libauthdbmail.la"
--
--WARN=0
--if test ! "${authldapheadername-x}" = "x"
--then
--  # --with-auth-ldap was specified
--  AC_MSG_RESULT([using LDAP authentication])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for ldap.h (user supplied)])
--    if test -r "$authldapheadername/ldap.h"
--      then
--      # found
--        AC_MSG_RESULT([$authldapheadername/ldap.h])
--        LDAPINC=$authldapheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        LDAPINC=""
--        authldapheadername=""
--        AC_MSG_ERROR([
--  Unable to find ldap.h where you specified, try just --with-auth-ldap to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for ldap.h])
--    for ldappaths in $ldapheaderpaths
--    do
--      if test -r "$ldappaths/ldap.h"
--      then
--        LDAPINC="$ldappaths"
--        AC_MSG_RESULT([$ldappaths/ldap.h])
--        break
--      fi
--    done
--    if test -z "$LDAPINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate ldap.h, try specifying with --with-ldap])
--    fi
--  fi
--else
--  AC_MSG_RESULT([using SQL authentication])
--fi
--])
--
--dnl DBMAIL_CHECK_LDAP_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
--# Look for libs needed to link to LDAP first
--if test ! "${authldapheadername-x}" = "x"
--then
--  AC_CHECK_LIB(ldap,ldap_bind,[ LDAPLIB="-lldap"], [LDAPLIB=""])
--  if test -z "$LDAPLIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against ldap.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no ldap needed
--  LDAPLIB=""
--fi
--])
--dnl AC_COMPILE_WARNINGS
--dnl set to compile with '-W -Wall'
--AC_DEFUN([AC_COMPILE_WARNINGS],
--[AC_MSG_CHECKING(maximum warning verbosity option)
--if test -n "$CXX"
--then
--  if test "$GXX" = "yes"
--  then
--    ac_compile_warnings_opt='-Wall'
--  fi
--  CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
--fi
--if test -n "$CC"
--then
--  if test "$GCC" = "yes"
--  then
--    ac_compile_warnings_opt='-W -Wall -Wpointer-arith -Wstrict-prototypes'
--  fi
--  CFLAGS="$CFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
--fi
--AC_MSG_RESULT($ac_compile_warnings_msg)
--unset ac_compile_warnings_msg
--unset ac_compile_warnings_opt
--])
--
--# ----------------------------------------------------------------
--# DBMAIL_CHECK_GC
--# I cheated I copied from w3m's acinclude.m4 :)
--# Modified for DBMAIL by Dan Weber
--# ----------------------------------------------------------------
--AC_DEFUN([DBMAIL_CHECK_GC],
--[AC_MSG_CHECKING(for --with-gc)
--AC_ARG_WITH(gc,
-- [  --with-gc[=PREFIX]        libgc PREFIX],
-- [test x"$with_gc" = xno && with_gc="no"],
-- [with_gc="no"])
-- AC_MSG_RESULT($with_gc)
--# Don't check for gc if not appended to command line
-- if test x"$with_gc" = xyes
-- then
-- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
-- unset ac_cv_header_gc_h
-- AC_CHECK_HEADER(gc/gc.h)
-- if test x"$ac_cv_header_gc_h" = xno; then
--   AC_MSG_CHECKING(GC header location)
--   AC_MSG_RESULT($with_gc)
--   gcincludedir=no
--   for dir in $with_gc; do
--     for inc in include include/gc; do
--       cflags="$CFLAGS"
--       CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"
--       AC_MSG_CHECKING($dir/$inc)
--       unset ac_cv_header_gc_h
--       AC_CHECK_HEADER(gc/gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"; break])
--       CFLAGS="$cflags"
--     done
--     if test x"$gcincludedir" != xno; then
--       break;
--     fi
--   done
--   if test x"$gcincludedir" = xno; then
--     AC_MSG_ERROR([gc/gc.h not found])
--   fi
-- else
--  cflags="$CFLAGS -DUSE_GC=1"
--  CFLAGS="$cflags"
-- fi
-- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-- if test x"$ac_cv_lib_gc_GC_init" = xno; then
--    AC_MSG_CHECKING(GC library location)
--    AC_MSG_RESULT($with_gc)
--    gclibdir=no
--    for dir in $with_gc; do
--      ldflags="$LDFLAGS"
--      LDFLAGS="$LDFLAGS -L$dir/lib"
--      AC_MSG_CHECKING($dir)
--      unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
--      LDFLAGS="$ldflags"
--    done
--    if test x"$gclibdir" = xno; then
--      AC_MSG_ERROR([libgc not found])
--    fi
-- fi
--fi])
--
--# getopt.m4 serial 6
--dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# The getopt module assume you want GNU getopt, with getopt_long etc,
--# rather than vanilla POSIX getopt.  This means your your code should
--# always include <getopt.h> for the getopt prototypes.
--
--AC_DEFUN([CHECK_GETOPT_SUBSTITUTE],
--[
--  GETOPT_H=getopt.h
--  AC_LIBOBJ([getopt])
--  AC_LIBOBJ([getopt1])
--  AC_DEFINE([USE_DM_GETOPT], 1,
--    [Define if my_getopt should be used instead of the system's getopt.])
--  USE_DM_GETOPT=1
--  AC_SUBST([USE_DM_GETOPT])
--])
--
--AC_DEFUN([DBMAIL_CHECK_GETOPT],
--[
--  CHECK_PREREQ_GETOPT
--
--  if test -z "$GETOPT_H"; then
--    GETOPT_H=
--    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
--    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
--
--    dnl BSD getopt_long uses an incompatible method to reset option processing,
--    dnl and (as of 2004-10-15) mishandles optional option-arguments.
--    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
--
--    if test -n "$GETOPT_H"; then
--      CHECK_GETOPT_SUBSTITUTE
--    fi
--  fi
--])
--
--# Prerequisites of lib/getopt*.
--AC_DEFUN([CHECK_PREREQ_GETOPT], [:])
--
--#
--# socklen_t
--# from curl
--
--dnl Check for socklen_t: historically on BSD it is an int, and in
--dnl POSIX 1g it is a type of its own, but some platforms use different
--dnl types for the argument to getsockopt, getpeername, etc.  So we
--dnl have to test to find something that will work.
--AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T],
--[
--   AC_CHECK_TYPE([socklen_t], ,[
--      AC_MSG_CHECKING([for socklen_t equivalent])
--      AC_CACHE_VAL([socklen_t_equiv],
--      [
--         # Systems have either "struct sockaddr *" or
--         # "void *" as the second argument to getpeername
--         socklen_t_equiv=
--         for arg2 in "struct sockaddr" void; do
--            for t in int size_t unsigned long "unsigned long"; do
--               AC_TRY_COMPILE([
--                  #include <sys/types.h>
--                  #include <sys/socket.h>
--
--                  int getpeername (int, $arg2 *, $t *);
--               ],[
--                  $t len;
--                  getpeername(0,0,&len);
--               ],[
--                  socklen_t_equiv="$t"
--                  break
--               ])
--            done
--         done
--
--         if test "x$socklen_t_equiv" = x; then
--            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
--         fi
--      ])
--      AC_MSG_RESULT($socklen_t_equiv)
--      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
--                        [type to use in place of socklen_t if not defined])],
--      [#include <sys/types.h>
--#include <sys/socket.h>])
--])
--
--
--# lib-prefix.m4 serial 4 (gettext-0.14.2)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
--dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
--dnl require excessive bracketing.
--ifdef([AC_HELP_STRING],
--[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
--[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
--
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
--
--# lib-link.m4 serial 6 (gettext-0.14.3)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_PREREQ(2.50)
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
--  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
--
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
--
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
--
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  acl_cv_prog_gnu_ld=yes ;;
--*)
--  acl_cv_prog_gnu_ld=no ;;
--esac])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
--
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# Prepare PATH_SEPARATOR.
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break ;;
--      *)
--	test "$with_gnu_ld" != yes && break ;;
--      esac
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
--])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 47 AC_PROG_LIBTOOL
--# Debian $Rev: 214 $
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1527,7 +123,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
- 
- # Same as above, but do not quote variable references.
-@@ -1547,7 +143,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -1595,6 +191,8 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+_LT_CC_BASENAME([$compiler])
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -1640,6 +238,48 @@
- ])# _LT_AC_SYS_COMPILER
- 
- 
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
- # Links a minimal program and checks the executable
-@@ -1712,15 +352,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -1889,7 +529,7 @@
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -1971,7 +611,7 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1981,8 +621,10 @@
-    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-      fi
-    fi
-@@ -2008,11 +650,16 @@
-    LDFLAGS="$LDFLAGS $3"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-      else
-        $2=yes
-      fi
-@@ -2071,11 +718,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -2180,7 +854,7 @@
- }]
- EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) $1 ;;
-@@ -2329,7 +1003,7 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2341,11 +1015,13 @@
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -2409,8 +1085,8 @@
- [AC_MSG_CHECKING([how to hardcode library paths into programs])
- _LT_AC_TAGVAR(hardcode_action, $1)=
- if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2577,7 +1253,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2605,7 +1281,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -2635,7 +1312,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -2658,7 +1335,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -2693,8 +1370,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -2712,7 +1398,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -2739,7 +1425,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -2838,7 +1524,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -2913,7 +1599,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -3079,7 +1769,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  AC_LIBTOOL_LANG_CXX_CONFIG
- 	else
- 	  tagname=""
-@@ -3141,7 +1833,7 @@
- 
- # AC_LIBTOOL_WIN32_DLL
- # --------------------
--# declare package support for building win32 dll's
-+# declare package support for building win32 DLLs
- AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
- [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
- ])# AC_LIBTOOL_WIN32_DLL
-@@ -3315,7 +2007,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -3425,7 +2117,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -3457,7 +2149,7 @@
- AC_DEFUN([AC_PROG_LD_GNU],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -3484,6 +2176,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- ])# AC_PROG_LD_RELOAD_FLAG
- 
- 
-@@ -3517,7 +2218,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3540,13 +2241,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -3562,7 +2263,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3612,12 +2313,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -3738,13 +2437,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl convenience library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-convenience to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!).  If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
- AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case $enable_ltdl_convenience in
-@@ -3763,13 +2462,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl installable library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!).  If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-install to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
- AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -3807,10 +2506,21 @@
- # ---------------
- AC_DEFUN([_LT_AC_LANG_CXX],
- [AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
- ])# _LT_AC_LANG_CXX
- 
-+# _LT_AC_PROG_CXXCPP
-+# ---------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
- 
- # AC_LIBTOOL_F77
- # --------------
-@@ -3883,6 +2593,10 @@
- 
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -3933,7 +2647,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -3946,43 +2660,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
-     ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -4008,7 +2685,7 @@
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_PUSH(C++)
- AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -4037,7 +2714,7 @@
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -4052,6 +2729,10 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -4073,7 +2754,7 @@
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -4180,7 +2861,7 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -4201,6 +2882,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -4246,7 +2930,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -4260,6 +2944,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -4283,65 +2968,76 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
--    ;;
-+        ;;
- 
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4352,14 +3048,14 @@
- 	;;
-     esac
-     ;;
--  freebsd[12]*)
-+  freebsd[[12]]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4376,11 +3072,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
--    aCC)
-+    aCC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -4390,7 +3086,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -4404,7 +3100,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -4420,7 +3116,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4441,12 +3137,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -4467,7 +3163,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -4485,9 +3181,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -4498,7 +3194,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -4511,7 +3207,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4536,17 +3232,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -4577,7 +3297,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4598,9 +3318,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  openbsd*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4616,14 +3352,14 @@
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4641,7 +3377,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4660,7 +3396,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4675,17 +3411,17 @@
- 	# the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4704,7 +3440,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4728,7 +3464,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4740,12 +3476,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4758,36 +3494,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -4795,7 +3528,7 @@
- 	# in the archive.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -4838,7 +3571,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4944,7 +3677,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -5020,6 +3753,21 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+])
-+
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -5070,12 +3818,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-@@ -5085,7 +3837,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -5094,7 +3846,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -5145,20 +3899,27 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- 
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- 
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
- AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
- AC_LIBTOOL_PROG_COMPILER_PIC($1)
- AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -5201,11 +3962,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- 
- AC_LIBTOOL_CONFIG($1)
-@@ -5341,7 +4107,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -5352,11 +4118,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -5387,6 +4153,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -5463,7 +4235,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -5737,9 +4509,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -5761,6 +4530,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDGIRSTW]]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[[BCDEGRST]]'
-   ;;
-@@ -5792,8 +4568,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -5957,7 +4736,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -5982,18 +4761,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6001,22 +4790,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -6031,7 +4820,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -6042,18 +4831,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -6070,7 +4865,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -6081,14 +4876,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -6104,7 +4899,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -6113,13 +4908,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- 	    ;;
-@@ -6129,12 +4924,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6144,7 +4939,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
-@@ -6215,7 +5010,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6241,6 +5036,16 @@
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -6252,7 +5057,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6276,12 +5081,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-       ccc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         # All Alpha code is PIC.
-@@ -6302,9 +5114,14 @@
-       ;;
- 
-     solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -6326,6 +5143,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-     uts4*)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6353,7 +5175,7 @@
-     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -6386,7 +5208,7 @@
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6432,7 +5254,8 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
--
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  _LT_CC_BASENAME([$compiler])
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -6452,6 +5275,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -6502,7 +5346,7 @@
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_AC_TAGVAR(always_export_symbols, $1)=no
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -6516,7 +5360,39 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
-@@ -6551,39 +5427,13 @@
-       fi
-       ;;
- 
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--      fi
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6594,16 +5444,11 @@
-       ;;
-     esac
- 
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
--      runpath_var=LD_RUN_PATH
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--      fi
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -6667,7 +5512,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.[012]|aix4.[012].*)
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -6688,6 +5533,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -6732,7 +5580,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -6746,7 +5594,7 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[[45]]*)
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-@@ -6767,57 +5615,57 @@
-       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      case "$host_os" in
--      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
-+      case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -6851,7 +5699,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6876,7 +5724,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -6885,7 +5733,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -6895,7 +5743,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -6962,6 +5810,7 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-@@ -7007,7 +5856,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -7026,10 +5875,12 @@
-     solaris*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -7038,8 +5889,18 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       case $host_os in
-       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-@@ -7300,7 +6161,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7325,8 +6186,887 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- ])
-+SED=$lt_cv_path_SED
- AC_MSG_RESULT([$SED])
- ])
- 
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
diff --git a/mail/dbmail20/pkg-descr b/mail/dbmail20/pkg-descr
deleted file mode 100644
index 2c03d30b6ea9..000000000000
--- a/mail/dbmail20/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Dbmail is the name of a group of programs that enable the possiblilty of storing
-and retrieving mail messages from a database (currently MySQL or PostgreSQL).
-
-What are the advantages?
-
-    * Scalability.
-      Dbmail is as scalable as the database that is used for the mail storage.
-    * Manageability.
-      Dbmail is based upon a database. Dbmail can be managed by changing
-      settings in the database (f.e. using PHP/Perl/SQL).
-    * Speed.
-      Dbmail uses very efficient, database specific queries for retrieving mail
-      information. This is much faster then parsing a filesystem.
-    * Security.
-      Dbmail has got nothing to do with the filesystem or interaction with other
-      programs in the Unix environment which need special permissions.  Dbmail
-      is as secure as the database it's based upon.
-    * Flexibility.
-      Changes on a Dbmail system (adding of users, changing passwords etc.) are
-      effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail20/pkg-plist b/mail/dbmail20/pkg-plist
deleted file mode 100644
index dc430f4e2413..000000000000
--- a/mail/dbmail20/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-etc/dbmail.conf-dist
-lib/dbmail/libauthdbmail.so.0
-lib/dbmail/libauthdbmail.a
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libauthdbmail.so
-lib/dbmail/libsortdbmail.so.0
-lib/dbmail/libsortdbmail.a
-lib/dbmail/libsortdbmail.la
-lib/dbmail/libsortdbmail.so
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
-%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%lib/dbmail/libmysqldbmail.so.0
-%%MYSQL%%lib/dbmail/libmysqldbmail.a
-%%MYSQL%%lib/dbmail/libmysqldbmail.la
-%%MYSQL%%lib/dbmail/libmysqldbmail.so
-%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so.0
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so
-@dirrm lib/dbmail
-@dirrm %%DATADIR%%/sql
-@dirrm %%DATADIR%%
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
deleted file mode 100644
index cb7adc9d2047..000000000000
--- a/mail/dbmail21/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for:	dbmail
-# Date created:				07/26/2003
-# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbmail
-PORTVERSION=	2.0.7
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.0/
-PKGNAMESUFFIX=	-${DATABASE}
-
-MAINTAINER=	mark_sf@kikg.ifmo.ru
-COMMENT=	An SQL database-based mail system (POP3 and IMAP)
-
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	YES
-USE_OPENSSL=	YES
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
-INSTALLS_SHLIB=	yes
-
-CFLAGS += -fPIC
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=	--with-pgsql
-USE_PGSQL=		yes
-DATABASE=		postgresql
-PLIST_SUB+=		PGSQL=""
-PLIST_SUB+=		MYSQL="@comment "
-LDFLAGS+=		-L${LOCALBASE}/lib/
-.else
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql
-DATABASE=		mysql
-PLIST_SUB+=		MYSQL=""
-PLIST_SUB+=		PGSQL="@comment "
-CFLAGS+=		-I${LOCALBASE}/include/mysql
-LDFLAGS+=		-L${LOCALBASE}/lib/mysql
-.endif
-
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
-PORTDOCS=		INSTALL README EXTRAS
-
-MAN1=			dbmail-smtp.1
-MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
-			dbmail-users.8 dbmail-util.8
-MANCOMPRESSED=		no
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} "   By default dbmail uses MySQL backend database."
-	@${ECHO} "   To build dbmail with PostgreSQL as backend database,"
-	@${ECHO} "	define WITH_POSTGRESQL"
-	@${ECHO} ""
-
-post-patch:
-	${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	${FIND} ${WRKSRC} -name '*.orig' -type f -delete
-
-post-configure:
-	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
-				${WRKSRC}/dbmail.h
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@${MKDIR} ${DATADIR}/sql
-	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
-	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${ECHO} ""
-	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
-	@${ECHO} ""
-	@${ECHO} "	*) Don't forget to update the database using a script from"
-	@${ECHO} "	   ${DATADIR}/sql/"
-	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
-	@${ECHO} "	*) Read the upgrading notes."
-	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
-	@${ECHO} "	*) dbmail can be controled by setting dbmail_imapd_enable,"
-	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
-	@${ECHO} "	   /etc/rc.conf."
-	@${ECHO} ""
-
-.include <bsd.port.mk>
diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo
deleted file mode 100644
index b2ac397cfd4c..000000000000
--- a/mail/dbmail21/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.0.7.tar.gz) = 11e6eded9e5ec533f6e6ed11fc62a4d8
-SHA256 (dbmail-2.0.7.tar.gz) = ef678002a0f6eed3ae8babc17760e36a76e678852c50d70d8dee1fe693f54026
-SIZE (dbmail-2.0.7.tar.gz) = 584457
diff --git a/mail/dbmail21/files/dbmail-imapd.sh.in b/mail/dbmail21/files/dbmail-imapd.sh.in
deleted file mode 100644
index 82505e96d9b0..000000000000
--- a/mail/dbmail21/files/dbmail-imapd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-imapd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-imapd: 
-#
-#dbmail_imapd_enable="YES"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_imapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-lmtpd.sh.in b/mail/dbmail21/files/dbmail-lmtpd.sh.in
deleted file mode 100644
index f1133f43a70e..000000000000
--- a/mail/dbmail21/files/dbmail-lmtpd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-lmtpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: 
-#
-#dbmail_lmtpd_enable="YES"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_lmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-pop3d.sh.in b/mail/dbmail21/files/dbmail-pop3d.sh.in
deleted file mode 100644
index d787f6a668e7..000000000000
--- a/mail/dbmail21/files/dbmail-pop3d.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-pop3d
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
-#
-#dbmail_pop3d_enable="YES"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_pop3d
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail21/files/patch-2.0.7_001_266 b/mail/dbmail21/files/patch-2.0.7_001_266
deleted file mode 100644
index b3650d832c24..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_001_266
+++ /dev/null
@@ -1,27 +0,0 @@
---- server.c.orig	Wed Aug 24 13:35:38 2005
-+++ server.c	Tue Sep 13 22:21:59 2005
-@@ -119,7 +119,7 @@
-   
-  	trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop");
-  	while (!GeneralStopRequested) {
--		if (db_connect() != 0) {
-+		if (db_check_connection() != 0) {
- 			
- 			if (! stopped) 
- 				manage_stop_children();
-@@ -128,12 +128,11 @@
- 			sleep(10);
- 			
- 		} else {
--			if (stopped) 
-+			if (stopped) {
-+				manage_restart_children();
- 				stopped=0;
-- 			
--			db_disconnect();
-+			}
- 
--			manage_restart_children();
- 			manage_spare_children();
- 
- 			sleep(1);
diff --git a/mail/dbmail21/files/patch-2.0.7_002 b/mail/dbmail21/files/patch-2.0.7_002
deleted file mode 100644
index 81d8790d3614..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_002
+++ /dev/null
@@ -1,1397 +0,0 @@
---- ChangeLog	(revision 1888)
-+++ ChangeLog	(revision 1889)
-@@ -1,3 +1,17 @@
-+2005-09-27  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
-+	  debian/changelog, server.c:
-+	do not close database connection on startup (closes: #271)
-+
-+2005-09-23  Paul J Stevens <paul@nfg.nl>
-+
-+	* debian/control, debian/patches/00list, 
-+	  debian/patches/04_mailfilter.dpatch:
-+	added mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	fix some compiler warnings in mailfilter patch
-+
- 2005-09-14  Paul J Stevens <paul@nfg.nl>
- 
- 	* debian/control:
---- buildtools/config.guess	(revision 1888)
-+++ buildtools/config.guess	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-08-03'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,13 +17,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -66,11 +68,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -123,7 +125,7 @@
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -196,55 +198,20 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    luna88k:OpenBSD:*:*)
--    	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -297,40 +264,43 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-     *:z/VM:*:*)
- 	echo s390-ibm-zvmoe
--	exit 0 ;;
-+	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -372,10 +342,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +357,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +371,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +428,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +470,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +500,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -544,14 +515,18 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:[45])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-@@ -565,28 +540,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -648,9 +623,19 @@
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -658,11 +643,11 @@
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +675,166 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
- 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
-+	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
--    amd64:CYGWIN*:*:*)
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     crisv32:Linux:*:*)
- 	echo crisv32-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -862,7 +852,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -881,14 +871,17 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +895,7 @@
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +903,25 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +939,15 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
-+		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
-+		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
-+		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -982,15 +975,18 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -998,27 +994,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--	i*86:syllable:*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1026,15 +1022,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1052,73 +1049,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
-+	exit ;;
-     M68*:*:R3V[5678]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1126,65 +1123,65 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo ${UNAME_MACHINE}-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-@@ -1192,7 +1189,7 @@
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1200,25 +1197,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
-+	exit ;;
-     NSE-?:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1229,41 +1226,44 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     *:*VMS:*:*)
-     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
--	    A*) echo alpha-dec-vms && exit 0 ;;
--	    I*) echo ia64-dec-vms && exit 0 ;;
--	    V*) echo vax-dec-vms && exit 0 ;;
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
- 	esac ;;
-     *:XENIX:*:SysV)
- 	echo i386-pc-xenix
--	exit 0 ;;
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1295,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1384,11 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1397,22 +1398,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
---- buildtools/config.sub	(revision 1888)
-+++ buildtools/config.sub	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-07-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +21,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
- #
-@@ -83,11 +84,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +100,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -247,6 +248,7 @@
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-@@ -255,13 +257,14 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| ms1 \
- 	| msp430 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b \
-@@ -273,6 +276,9 @@
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -321,6 +327,7 @@
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-@@ -329,6 +336,7 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| mmix-* \
-+	| ms1-* \
- 	| msp430-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
-@@ -336,7 +344,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -351,6 +359,8 @@
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -761,9 +771,8 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
- 		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -1089,12 +1098,9 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
-@@ -1181,7 +1187,8 @@
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1199,7 +1206,7 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
-@@ -1388,6 +1395,9 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-@@ -1559,7 +1569,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mail/dbmail21/files/patch-2.0.7_002_271 b/mail/dbmail21/files/patch-2.0.7_002_271
deleted file mode 100644
index 40a21687020a..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_002_271
+++ /dev/null
@@ -1,10 +0,0 @@
---- server.c	(revision 1888)
-+++ server.c	(revision 1889)
-@@ -98,7 +98,6 @@
- 		return -1;
- 	if (db_check_version() != 0)
- 		return -1;
--	db_disconnect();
- 		
- 	ParentPID = getpid();
- 	Restart = 0;
diff --git a/mail/dbmail21/files/patch-2.0.7_003 b/mail/dbmail21/files/patch-2.0.7_003
deleted file mode 100644
index 1b83d01d5dca..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_003
+++ /dev/null
@@ -1,25 +0,0 @@
---- serverchild.c	(revision 1889)
-+++ serverchild.c	(revision 1890)
-@@ -312,19 +312,16 @@
- 
- 		client.timeoutMsg = info->timeoutMsg;
- 		client.timeout = info->timeout;
--		strncpy(client.ip, inet_ntoa(saClient.sin_addr),
--			IPNUM_LEN);
-+		strncpy(client.ip, inet_ntoa(saClient.sin_addr), IPNUM_LEN);
- 		client.clientname[0] = '\0';
- 
- 		if (info->resolveIP) {
--			clientHost =
--			    gethostbyaddr((char *) &saClient.sin_addr,
-+			clientHost = gethostbyaddr((char *) &saClient.sin_addr,
- 					  sizeof(saClient.sin_addr),
- 					  saClient.sin_family);
- 
- 			if (clientHost && clientHost->h_name)
--				strncpy(client.clientname,
--					clientHost->h_name, FIELDSIZE);
-+				strncpy(client.clientname, clientHost->h_name, FIELDSIZE);
- 
- 			trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]",
- 					__FILE__, __func__,
diff --git a/mail/dbmail21/files/patch-2.0.7_003_272 b/mail/dbmail21/files/patch-2.0.7_003_272
deleted file mode 100644
index 0bc97c9d9a2b..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_003_272
+++ /dev/null
@@ -1,22 +0,0 @@
---- sql/mysql/create_tables.mysql	(revision 1889)
-+++ sql/mysql/create_tables.mysql	(revision 1890)
-@@ -118,7 +118,7 @@
- CREATE TABLE dbmail_messageblks (
-    messageblk_idnr bigint(21) NOT NULL auto_increment,
-    physmessage_id bigint(21) DEFAULT '0' NOT NULL,
--   messageblk longtext NOT NULL,
-+   messageblk longblob NOT NULL,
-    blocksize bigint(21) DEFAULT '0' NOT NULL,
-    is_header tinyint(1) DEFAULT '0' NOT NULL,
-    PRIMARY KEY (messageblk_idnr),
---- sql/mysql/create_tables_innoDB.mysql	(revision 1889)
-+++ sql/mysql/create_tables_innoDB.mysql	(revision 1890)
-@@ -148,7 +148,7 @@
- CREATE TABLE dbmail_messageblks (
- 	messageblk_idnr bigint(21) NOT NULL auto_increment,
- 	physmessage_id bigint(21) NOT NULL default '0',
--	messageblk longtext NOT NULL,
-+	messageblk longblob NOT NULL,
- 	blocksize bigint(21) NOT NULL default '0',
- 	is_header tinyint(1) NOT NULL default '0',
- 	PRIMARY KEY (messageblk_idnr),
diff --git a/mail/dbmail21/files/patch-2.0.7_004 b/mail/dbmail21/files/patch-2.0.7_004
deleted file mode 100644
index 8bbd3b8c3f92..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_004
+++ /dev/null
@@ -1,95 +0,0 @@
---- ChangeLog	(revision 1890)
-+++ ChangeLog	(revision 1904)
-@@ -1,3 +1,12 @@
-+2005-10-01  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	added postgres table to mailfilter patch
-+	* debian/changelog, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	change dbmail_messageblks.messageblk from longtext to longblob in mysql
-+	create scripts
-+
- 2005-09-27  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
---- dsn.c	(revision 1890)
-+++ dsn.c	(revision 1904)
-@@ -309,8 +309,10 @@
- 	 */
- 	else {		/* from: 'if (delivery->useridnr != 0)' */
- 
--		alias_count =
--		    auth_check_user_ext(delivery->address,
-+		if (! strlen(delivery->address))
-+			return 0;
-+		
-+		alias_count = auth_check_user_ext(delivery->address,
- 					delivery->userids,
- 					delivery->forwards, 0);
- 		trace(TRACE_DEBUG,
---- auth/authsql.c	(revision 1890)
-+++ auth/authsql.c	(revision 1904)
-@@ -385,6 +385,9 @@
- 		return 0;
- 	}
- 	
-+	if (strlen(username) < 1)
-+		return 0;
-+
- 	saveres = db_get_result_set();
- 	db_set_result_set(NULL);
- 
---- main.c	(revision 1890)
-+++ main.c	(revision 1904)
-@@ -405,27 +405,25 @@
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
--		trace(TRACE_DEBUG, "main(): scanning for [%s]",
--		      deliver_to_header);
--		if (mail_adr_list(deliver_to_header, &users, &mimelist) !=
--		    0) {
--			trace(TRACE_STOP,
--			      "main(): scanner found no email addresses (scanned for %s)",
-+		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
-+		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
-+			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
- 			      deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
- 
- 		/* Loop through the users list, moving the entries into the dsnusers list. */
--		for (tmp = list_getstart(&users); tmp != NULL;
--		     tmp = tmp->nextnode) {
--			deliver_to_user_t dsnuser;
-+		for (tmp = list_getstart(&users); tmp != NULL; tmp = tmp->nextnode) {
- 
-+			if (! (strlen((char *)tmp->data) > 0))
-+				continue;
-+
-+			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser,
--				     sizeof(deliver_to_user_t));
-+			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
- 		}
- 	}
- 
-@@ -433,11 +431,10 @@
- 	if (deliver_to_mailbox != NULL) {
- 		trace(TRACE_DEBUG, "main(): setting mailbox for all deliveries to [%s]",
- 		      deliver_to_mailbox);
-+		
- 		/* Loop through the dsnusers list, setting the destination mailbox. */
--		for (tmp = list_getstart(&dsnusers); tmp != NULL;
--		     tmp = tmp->nextnode) {
-+		for (tmp = list_getstart(&dsnusers); tmp != NULL; tmp = tmp->nextnode) 
- 			((deliver_to_user_t *)tmp->data)->mailbox = dm_strdup(deliver_to_mailbox);
--		}
- 	}
- 
- 	if (dsnuser_resolve_list(&dsnusers) == -1) {
diff --git a/mail/dbmail21/files/patch-2.0.7_005 b/mail/dbmail21/files/patch-2.0.7_005
deleted file mode 100644
index 573a8e836f0b..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_005
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog	(revision 1904)
-+++ ChangeLog	(revision 1905)
-@@ -1,3 +1,8 @@
-+2005-10-18  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, auth/authsql.c, dsn.c, main.c:
-+	ignore empty addresses in delivery chain
-+
- 2005-10-01  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, debian/patches/04_mailfilter.dpatch:
diff --git a/mail/dbmail21/files/patch-2.0.7_005_277 b/mail/dbmail21/files/patch-2.0.7_005_277
deleted file mode 100644
index b659de88aac4..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_005_277
+++ /dev/null
@@ -1,38 +0,0 @@
---- imapcommands.c	(revision 1904)
-+++ imapcommands.c	(revision 1905)
-@@ -1787,6 +1787,8 @@
- 	if (args[i + 1]) {
- 		struct tm tm;
- 
-+		memset(&tm, 0, sizeof(struct tm));
-+
- 		if (strptime(args[i], "%d-%b-%Y %T", &tm) != NULL)
- 			strftime(sqldate,
- 				 sizeof(sqldate), "%Y-%m-%d %H:%M:%S",
---- imaputil.c	(revision 1904)
-+++ imaputil.c	(revision 1905)
-@@ -1788,13 +1788,14 @@
- 	time_t ltime;
-         char *last;
- 
-+	memset(&tm_sql_date, 0, sizeof(struct tm));
-+	
-         last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date);
-         if ( (last == NULL) || (*last != '\0') ) {
-                 strcpy(_imapdate, IMAP_STANDARD_DATE);
-                 return _imapdate;
-         }
- 
--	/* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */
- 	ltime = mktime (&tm_sql_date);
- 	tm_imap_date = localtime(&ltime);
- 
-@@ -1814,6 +1815,8 @@
- 	struct tm tm;
- 	char *last_char;
- 
-+	memset(&tm, 0, sizeof(struct tm));
-+
- 	last_char = strptime(imapdate, "%d-%b-%Y", &tm);
- 	if (last_char == NULL || *last_char != '\0') {
- 		trace(TRACE_DEBUG, "%s,%s: error parsing IMAP date %s",
diff --git a/mail/dbmail21/files/patch-2.0.7_006_281 b/mail/dbmail21/files/patch-2.0.7_006_281
deleted file mode 100644
index 40e64bebc054..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_006_281
+++ /dev/null
@@ -1,52 +0,0 @@
---- main.c	(revision 1905)
-+++ main.c	(revision 1948)
-@@ -388,8 +388,8 @@
- 
- 	/* parse the list and scan for field and content */
- 	if (mime_readheader(header, &dummyidx, &mimelist, &dummysize) < 0) {
--		trace(TRACE_ERROR,
--		      "main(): mime_readheader failed to read a header list");
-+		trace(TRACE_ERROR, "%s,%s: mime_readheader failed", 
-+				__FILE__, __func__);
- 		exitcode = EX_TEMPFAIL;
- 		goto freeall;
- 	}
-@@ -400,15 +400,16 @@
- 	if (returnpath.total_nodes == 0)
- 		mail_adr_list("From", &returnpath, &mimelist);
- 	if (returnpath.total_nodes == 0)
--		trace(TRACE_DEBUG, "main(): no return path found.");
-+		trace(TRACE_DEBUG, "%s,%s: no return path found.",
-+				__FILE__,__func__);
- 
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
- 		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
- 		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
--			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
--			      deliver_to_header);
-+			trace(TRACE_STOP, "%s,%s: no email addresses found (scanned for %s)",
-+					__FILE__,__func__, deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
-@@ -419,11 +420,16 @@
- 			if (! (strlen((char *)tmp->data) > 0))
- 				continue;
- 
--			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
-+			if (! list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t))) {
-+				trace(TRACE_ERROR,"%s,%s: out of memory in list_nodeadd", 
-+						__FILE__, __func__);
-+				exitcode = EX_TEMPFAIL;
-+				goto freeall;
-+			}
-+			
- 		}
- 	}
- 
diff --git a/mail/dbmail21/files/patch-2.0.7_007 b/mail/dbmail21/files/patch-2.0.7_007
deleted file mode 100644
index 6d221a2ef59f..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_007
+++ /dev/null
@@ -1,9108 +0,0 @@
---- Makefile.in	(revision 1905)
-+++ Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,86 +32,209 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- 
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = .
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+bin_PROGRAMS = $(am__EXEEXT_1)
-+sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
-+	dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) \
-+	dbmail-users$(EXEEXT) dbmail-lmtpd$(EXEEXT)
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.in \
-+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-+	THANKS TODO buildtools/config.guess buildtools/config.sub \
-+	buildtools/depcomp buildtools/install-sh buildtools/ltmain.sh \
-+	buildtools/missing buildtools/mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libdbmail_la_DEPENDENCIES =
-+am__libdbmail_la_SOURCES_DIST = config.c debug.c list.c dbmd5.c md5.c \
-+	db.c misc.c mime.c pidfile.c dm_getopt.c server.c \
-+	serverchild.c pool.c header.c pipe.c forward.c dsn.c
-+@USE_DM_GETOPT_TRUE@am__objects_1 = dm_getopt.lo
-+am__objects_2 = config.lo debug.lo list.lo dbmd5.lo md5.lo db.lo \
-+	misc.lo mime.lo pidfile.lo $(am__objects_1)
-+am__objects_3 = server.lo serverchild.lo pool.lo
-+am__objects_4 = header.lo pipe.lo forward.lo dsn.lo
-+am_libdbmail_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-+	$(am__objects_4)
-+libdbmail_la_OBJECTS = $(am_libdbmail_la_OBJECTS)
-+@SIEVE_TRUE@am__EXEEXT_1 = dbmail-sievecmd$(EXEEXT) \
-+@SIEVE_TRUE@	dbmail-timsieved$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+am_dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \
-+	imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
-+	rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) \
-+	dbmsgbuf.$(OBJEXT) acl.$(OBJEXT)
-+dbmail_imapd_OBJECTS = $(am_dbmail_imapd_OBJECTS)
-+dbmail_imapd_DEPENDENCIES = libdbmail.la
-+am_dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
-+dbmail_lmtpd_OBJECTS = $(am_dbmail_lmtpd_OBJECTS)
-+dbmail_lmtpd_DEPENDENCIES = libdbmail.la
-+am_dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT)
-+dbmail_pop3d_OBJECTS = $(am_dbmail_pop3d_OBJECTS)
-+dbmail_pop3d_DEPENDENCIES = libdbmail.la
-+am__dbmail_sievecmd_SOURCES_DIST = sievecmd.c
-+@SIEVE_TRUE@am_dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT)
-+dbmail_sievecmd_OBJECTS = $(am_dbmail_sievecmd_OBJECTS)
-+@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la
-+am_dbmail_smtp_OBJECTS = main.$(OBJEXT)
-+dbmail_smtp_OBJECTS = $(am_dbmail_smtp_OBJECTS)
-+dbmail_smtp_DEPENDENCIES = libdbmail.la
-+am__dbmail_timsieved_SOURCES_DIST = timsieve.c timsieved.c
-+@SIEVE_TRUE@am_dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \
-+@SIEVE_TRUE@	timsieved.$(OBJEXT)
-+dbmail_timsieved_OBJECTS = $(am_dbmail_timsieved_OBJECTS)
-+@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la
-+am_dbmail_users_OBJECTS = user.$(OBJEXT)
-+dbmail_users_OBJECTS = $(am_dbmail_users_OBJECTS)
-+dbmail_users_DEPENDENCIES = libdbmail.la
-+am_dbmail_util_OBJECTS = maintenance.$(OBJEXT)
-+dbmail_util_OBJECTS = $(am_dbmail_util_OBJECTS)
-+dbmail_util_DEPENDENCIES = libdbmail.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdbmail_la_SOURCES) $(dbmail_imapd_SOURCES) \
-+	$(dbmail_lmtpd_SOURCES) $(dbmail_pop3d_SOURCES) \
-+	$(dbmail_sievecmd_SOURCES) $(dbmail_smtp_SOURCES) \
-+	$(dbmail_timsieved_SOURCES) $(dbmail_users_SOURCES) \
-+	$(dbmail_util_SOURCES)
-+DIST_SOURCES = $(am__libdbmail_la_SOURCES_DIST) \
-+	$(dbmail_imapd_SOURCES) $(dbmail_lmtpd_SOURCES) \
-+	$(dbmail_pop3d_SOURCES) $(am__dbmail_sievecmd_SOURCES_DIST) \
-+	$(dbmail_smtp_SOURCES) $(am__dbmail_timsieved_SOURCES_DIST) \
-+	$(dbmail_users_SOURCES) $(dbmail_util_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,343 +242,318 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- SUBDIRS = mysql pgsql auth sort man
--
- @SIEVE_TRUE@SIEVEPROGS = dbmail-sievecmd dbmail-timsieved
--
- @USE_DM_GETOPT_TRUE@DM_GETOPT = dm_getopt.c
--
--bin_PROGRAMS = $(SIEVEPROGS)
--sbin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-util dbmail-users dbmail-lmtpd 
--
- COMMON = config.c debug.c list.c dbmd5.c md5.c db.c misc.c mime.c pidfile.c $(DM_GETOPT)
- SERVER = server.c serverchild.c pool.c
- DELIVER = header.c pipe.c forward.c dsn.c
- 
- # CFLAGS
- AM_CFLAGS = -fomit-frame-pointer
--
- dbmail_smtp_SOURCES = main.c
--dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@
--
-+dbmail_smtp_LDADD = libdbmail.la
- dbmail_pop3d_SOURCES = pop3.c pop3d.c
--dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_pop3d_LDADD = libdbmail.la
- dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c
--dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ 
--
-+dbmail_imapd_LDADD = libdbmail.la
- dbmail_util_SOURCES = maintenance.c
--dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_util_LDADD = libdbmail.la
- dbmail_users_SOURCES = user.c
--dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_users_LDADD = libdbmail.la
- dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
--dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_lmtpd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_sievecmd_SOURCES = sievecmd.c 
--@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_timsieved_SOURCES = timsieve.c timsieved.c
--@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
--lib_LTLIBRARIES = libdbmail.la
-+@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la
-+noinst_LTLIBRARIES = libdbmail.la
- libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER)
--libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(lib_LTLIBRARIES)
-+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libdbmail_la_LDFLAGS = 
--libdbmail_la_DEPENDENCIES = 
--@USE_DM_GETOPT_FALSE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_FALSE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_FALSE@server.lo serverchild.lo pool.lo header.lo pipe.lo \
--@USE_DM_GETOPT_FALSE@forward.lo dsn.lo
--@USE_DM_GETOPT_TRUE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_TRUE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_TRUE@dm_getopt.lo server.lo serverchild.lo pool.lo \
--@USE_DM_GETOPT_TRUE@header.lo pipe.lo forward.lo dsn.lo
--@SIEVE_FALSE@bin_PROGRAMS = 
--@SIEVE_TRUE@bin_PROGRAMS =  dbmail-sievecmd$(EXEEXT) \
--@SIEVE_TRUE@dbmail-timsieved$(EXEEXT)
--sbin_PROGRAMS =  dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
--dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) dbmail-users$(EXEEXT) \
--dbmail-lmtpd$(EXEEXT)
--PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
--
--@SIEVE_TRUE@dbmail_sievecmd_OBJECTS =  sievecmd.$(OBJEXT)
--@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES =  libdbmail.la
--dbmail_sievecmd_LDFLAGS = 
--@SIEVE_TRUE@dbmail_timsieved_OBJECTS =  timsieve.$(OBJEXT) \
--@SIEVE_TRUE@timsieved.$(OBJEXT)
--@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES =  libdbmail.la
--dbmail_timsieved_LDFLAGS = 
--dbmail_smtp_OBJECTS =  main.$(OBJEXT)
--dbmail_smtp_DEPENDENCIES =  libdbmail.la
--dbmail_smtp_LDFLAGS = 
--dbmail_pop3d_OBJECTS =  pop3.$(OBJEXT) pop3d.$(OBJEXT)
--dbmail_pop3d_DEPENDENCIES =  libdbmail.la
--dbmail_pop3d_LDFLAGS = 
--dbmail_imapd_OBJECTS =  quota.$(OBJEXT) imap4.$(OBJEXT) \
--imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
--rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) dbmsgbuf.$(OBJEXT) \
--acl.$(OBJEXT)
--dbmail_imapd_DEPENDENCIES =  libdbmail.la
--dbmail_imapd_LDFLAGS = 
--dbmail_util_OBJECTS =  maintenance.$(OBJEXT)
--dbmail_util_DEPENDENCIES =  libdbmail.la
--dbmail_util_LDFLAGS = 
--dbmail_users_OBJECTS =  user.$(OBJEXT)
--dbmail_users_DEPENDENCIES =  libdbmail.la
--dbmail_users_LDFLAGS = 
--dbmail_lmtpd_OBJECTS =  lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
--dbmail_lmtpd_DEPENDENCIES =  libdbmail.la
--dbmail_lmtpd_LDFLAGS = 
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
--Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \
--config.in configure configure.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/acl.P .deps/config.P .deps/db.P .deps/dbmd5.P \
--.deps/dbmsgbuf.P .deps/dbsearch.P .deps/debug.P .deps/dm_getopt.P \
--.deps/dsn.P .deps/forward.P .deps/header.P .deps/imap4.P \
--.deps/imapcommands.P .deps/imapd.P .deps/imaputil.P .deps/list.P \
--.deps/lmtp.P .deps/lmtpd.P .deps/main.P .deps/maintenance.P .deps/md5.P \
--.deps/memblock.P .deps/mime.P .deps/misc.P .deps/pidfile.P .deps/pipe.P \
--.deps/pool.P .deps/pop3.P .deps/pop3d.P .deps/quota.P .deps/rfcmsg.P \
--.deps/server.P .deps/serverchild.P .deps/sievecmd.P .deps/timsieve.P \
--.deps/timsieved.P .deps/user.P
--SOURCES = $(libdbmail_la_SOURCES) $(dbmail_sievecmd_SOURCES) $(dbmail_timsieved_SOURCES) $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_util_SOURCES) $(dbmail_users_SOURCES) $(dbmail_lmtpd_SOURCES)
--OBJECTS = $(libdbmail_la_OBJECTS) $(dbmail_sievecmd_OBJECTS) $(dbmail_timsieved_OBJECTS) $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_util_OBJECTS) $(dbmail_users_OBJECTS) $(dbmail_lmtpd_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-+.SUFFIXES: .c .lo .o .obj
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
- 
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
--config.h: stamp-h
-+config.h: stamp-h1
- 	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) stamp-h1; \
- 	else :; fi
--stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+
-+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+	rm -f stamp-h1
-+	touch $@
- 
--mostlyclean-hdr:
--
--clean-hdr:
--
- distclean-hdr:
--	-rm -f config.h
-+	-rm -f config.h stamp-h1
- 
--maintainer-clean-hdr:
--
--mostlyclean-libLTLIBRARIES:
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--
--distclean-libLTLIBRARIES:
--
--maintainer-clean-libLTLIBRARIES:
--
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
--	  else :; fi; \
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
- 	done
--
--uninstall-libLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--	done
--
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
--
--mostlyclean-compile:
--	-rm -f *.o core *.core
--	-rm -f *.$(OBJEXT)
--
--clean-compile:
--
--distclean-compile:
--	-rm -f *.tab.c
--
--maintainer-clean-compile:
--
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--mostlyclean-libtool:
--	-rm -f *.lo
--
--clean-libtool:
--	-rm -rf .libs _libs
--
--distclean-libtool:
--
--maintainer-clean-libtool:
--
--libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
--
--mostlyclean-binPROGRAMS:
--
--clean-binPROGRAMS:
--	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--
--distclean-binPROGRAMS:
--
--maintainer-clean-binPROGRAMS:
--
-+libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) 
-+	$(LINK)  $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
- 
--mostlyclean-sbinPROGRAMS:
--
--clean-sbinPROGRAMS:
--	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
--
--distclean-sbinPROGRAMS:
--
--maintainer-clean-sbinPROGRAMS:
--
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-sbinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
- 	done
- 
--dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES)
-+clean-sbinPROGRAMS:
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) 
-+	@rm -f dbmail-imapd$(EXEEXT)
-+	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) 
-+	@rm -f dbmail-lmtpd$(EXEEXT)
-+	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) 
-+	@rm -f dbmail-pop3d$(EXEEXT)
-+	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) 
- 	@rm -f dbmail-sievecmd$(EXEEXT)
- 	$(LINK) $(dbmail_sievecmd_LDFLAGS) $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_LDADD) $(LIBS)
--
--dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES)
-+dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) 
-+	@rm -f dbmail-smtp$(EXEEXT)
-+	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) 
- 	@rm -f dbmail-timsieved$(EXEEXT)
- 	$(LINK) $(dbmail_timsieved_LDFLAGS) $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_LDADD) $(LIBS)
-+dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) 
-+	@rm -f dbmail-users$(EXEEXT)
-+	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) 
-+	@rm -f dbmail-util$(EXEEXT)
-+	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
- 
--dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES)
--	@rm -f dbmail-smtp$(EXEEXT)
--	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
- 
--dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES)
--	@rm -f dbmail-pop3d$(EXEEXT)
--	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+distclean-compile:
-+	-rm -f *.tab.c
- 
--dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES)
--	@rm -f dbmail-imapd$(EXEEXT)
--	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmd5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmsgbuf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsearch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dm_getopt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsn.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap4.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapcommands.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaputil.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtpd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maintenance.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblock.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3d.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfcmsg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverchild.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievecmd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieve.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieved.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
- 
--dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES)
--	@rm -f dbmail-util$(EXEEXT)
--	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES)
--	@rm -f dbmail-users$(EXEEXT)
--	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES)
--	@rm -f dbmail-lmtpd$(EXEEXT)
--	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
--
--@SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -463,7 +565,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -471,13 +573,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -487,246 +600,327 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.in $$unique $(LISP))
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
- 
--mostlyclean-tags:
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
--clean-tags:
--
- distclean-tags:
--	-rm -f TAGS ID
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
--maintainer-clean-tags:
--
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
--
--# This target untars the dist file and tries a VPATH configuration.  Then
--# it guarantees that the distribution is self-contained by making another
--# tarfile.
--distcheck: dist
--	-rm -rf $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
--	dc_install_base=`cd $(distdir)/=inst && pwd`; \
--	cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
--	  && $(MAKE) $(AM_MAKEFLAGS) check \
--	  && $(MAKE) $(AM_MAKEFLAGS) install \
--	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist
--	-rm -rf $(distdir)
--	@banner="$(distdir).tar.gz is ready for distribution"; \
--	dashes=`echo "$$banner" | sed s/./=/g`; \
--	echo "$$dashes"; \
--	echo "$$banner"; \
--	echo "$$dashes"
--dist: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
--dist-all: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
- distdir: $(DISTFILES)
--	-rm -rf $(distdir)
-+	$(am__remove_distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	$(mkdir_p) $(distdir)/buildtools
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--	for subdir in $(SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
- 
---include $(DEP_FILES)
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
- 
--mostlyclean-depend:
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
- 
--clean-depend:
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
- 
--distclean-depend:
--	-rm -rf .deps
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-recursive
--dvi-am:
--dvi: dvi-recursive
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--installcheck-am:
--installcheck: installcheck-recursive
--all-recursive-am: config.h
--	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
--		install-sbinPROGRAMS
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
--
--install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
--		uninstall-sbinPROGRAMS
--uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
--all-redirect: all-recursive-am
-+
-+installcheck: installcheck-recursive
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
--		$(DESTDIR)$(sbindir)
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
--		mostlyclean-compile mostlyclean-libtool \
--		mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
--		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
- 
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am
- 
--clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
--		clean-depend clean-generic mostlyclean-am
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-hdr distclean-libtool distclean-tags
- 
--clean: clean-recursive
-+dvi: dvi-recursive
- 
--distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-binPROGRAMS \
--		distclean-sbinPROGRAMS distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-recursive
--	-rm -f config.status
-+html: html-recursive
- 
--maintainer-clean-am:  maintainer-clean-hdr \
--		maintainer-clean-libLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-binPROGRAMS \
--		maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
--		maintainer-clean-depend maintainer-clean-generic \
--		distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
- 
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-recursive
--	-rm -f config.status
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
--clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
--uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
--distclean-compile clean-compile maintainer-clean-compile \
--mostlyclean-libtool distclean-libtool clean-libtool \
--maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
--clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
--install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
--clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
--install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
--install-exec-recursive uninstall-exec-recursive installdirs-recursive \
--uninstalldirs-recursive all-recursive check-recursive \
--installcheck-recursive info-recursive dvi-recursive \
--mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck all-recursive-am install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-recursive
- 
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
- 
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-sbinPROGRAMS
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-recursive clean-sbinPROGRAMS \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-compile distclean-generic distclean-hdr \
-+	distclean-libtool distclean-recursive distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-sbinPROGRAMS \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am uninstall-sbinPROGRAMS
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- man/Makefile.in	(revision 1905)
-+++ man/Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -26,88 +30,116 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = man
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-+man8dir = $(mandir)/man8
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,41 +147,105 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 \
-+	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
- 
--man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
-+all: all-am
- 
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--man1dir = $(mandir)/man1
--man8dir = $(mandir)/man8
--MANS = $(man_MANS)
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  man/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
- 
--NROFF = nroff
--DIST_COMMON =  Makefile.am Makefile.in
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+mostlyclean-libtool:
-+	-rm -f *.lo
- 
--TAR = tar
--GZIP_ENV = --best
--all: all-redirect
--.SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
-+clean-libtool:
-+	-rm -rf .libs _libs
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--install-man1:
--	$(mkinstalldirs) $(DESTDIR)$(man1dir)
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-man1: $(man1_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -158,31 +254,43 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
- uninstall-man1:
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
--install-man8:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir)
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+install-man8: $(man8_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -191,120 +299,161 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--
- uninstall-man8:
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--install-man: $(MANS)
--	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man8
--uninstall-man:
--	@$(NORMAL_UNINSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man8
- tags: TAGS
- TAGS:
- 
-+ctags: CTAGS
-+CTAGS:
- 
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
--subdir = man
--
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
-+all-am: Makefile $(MANS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am: install-man
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-man
--uninstall: uninstall-am
--all-am: Makefile $(MANS)
--all-redirect: all-am
-+
-+installcheck: installcheck-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man8
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool mostlyclean-am
- 
--clean-am:  clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
- 
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man: install-man1 install-man8
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: install-man1 uninstall-man1 install-man8 uninstall-man8 \
--install-man uninstall-man tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-am
- 
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-man
-+
-+uninstall-man: uninstall-man1 uninstall-man8
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-man8 install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-man uninstall-man1 uninstall-man8
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- configure.in	(revision 1905)
-+++ configure.in	(revision 1948)
-@@ -19,7 +19,6 @@
- AC_INIT(main.c)
- AC_CONFIG_AUX_DIR(buildtools)
- AM_CONFIG_HEADER(config.h:config.in)
--DBMAIL_MSG_CONFIGURE_START
- AM_INIT_AUTOMAKE(dbmail, 2.0.7)
- AM_MAINTAINER_MODE
- 
---- ChangeLog	(revision 1905)
-+++ ChangeLog	(revision 1948)
-@@ -1,3 +1,46 @@
-+2005-12-22  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog:
-+	blah
-+	* imapcommands.c, imaputil.c:
-+	resync git tree
-+	* ChangeLog:
-+	Merge with /home/paul/git/dbmail-2.0
-+commit d97cef746efa52603fc423759bfe216b53859321
-+tree 32074d5cac257cf2b30ed48979ca88050441e4c7
-+parent 8c598295ff66c378785b2187f6923c99b5df2a6f
-+author Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+committer Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+	* ChangeLog:
-+	blah
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	update mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/po/es.po:
-+	adding spanish translation of debconf files
-+	* INSTALL, INSTALL.dbmail, Makefile.in, acinclude.m4, aclocal.m4, 
-+	  auth/Makefile.in, buildtools/install-sh, buildtools/ltmain.sh, 
-+	  buildtools/missing, buildtools/mkinstalldirs, configure, 
-+	  configure.in, debian/control, debian/rules, man/Makefile.in, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	cleanup autotools chain a bit
-+	* main.c:
-+	remove redeclaration of global dsnuser (closes: #281)
-+	* INSTALL, Makefile.in, auth/Makefile.in, buildtools/depcomp, debian/rules, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	updated autotools for autoconf-1.9
-+
-+2005-10-26  Paul J Stevens <paul@nfg.nl>
-+
-+	* dsn.c, main.c, server.c, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	resync tree
-+	* imapcommands.c, imaputil.c:
-+	initialize struct tm values before calling strptime (closes: #277)
-+
- 2005-10-18  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, auth/authsql.c, dsn.c, main.c:
---- buildtools/depcomp	(revision 0)
-+++ buildtools/depcomp	(revision 1948)
-@@ -0,0 +1,530 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-
---- buildtools/missing	(revision 1905)
-+++ buildtools/missing	(revision 1948)
-@@ -1,8 +1,12 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
--# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
- 
-+scriptversion=2005-06-08.21
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
-@@ -15,15 +19,47 @@
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- 
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
- if test $# -eq 0; then
-   echo 1>&2 "Try \`$0 --help' for more information"
-   exit 1
- fi
- 
-+run=:
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
- case "$1" in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -35,6 +71,7 @@
- Options:
-   -h, --help      display this help and exit
-   -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
- 
- Supported PROGRAM values:
-   aclocal      touch file \`aclocal.m4'
-@@ -43,13 +80,19 @@
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-   lex          create \`lex.yy.c', if possible, from existing .c
-   makeinfo     touch the output file
--  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
-     ;;
- 
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--    echo "missing - GNU libit 0.0"
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -58,10 +101,45 @@
-     exit 1
-     ;;
- 
--  aclocal)
-+esac
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+  lex|yacc)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+  aclocal*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-          to install the \`Automake' and \`Perl' packages.  Grab them from
-          any GNU archive site."
-     touch aclocal.m4
-@@ -69,8 +147,8 @@
- 
-   autoconf)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`configure.in'.  You might want to install the
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-          archive site."
-     touch configure
-@@ -78,11 +156,11 @@
- 
-   autoheader)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acconfig.h' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-          from any GNU archive site."
--    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
-@@ -95,10 +173,10 @@
-     touch $touch_files
-     ;;
- 
--  automake)
-+  automake*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-          You might want to install the \`Automake' and \`Perl' packages.
-          Grab them from any GNU archive site."
-     find . -type f -name Makefile.am -print |
-@@ -106,9 +184,32 @@
- 	   while read f; do touch "$f"; done
-     ;;
- 
-+  autom4te)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-   bison|yacc)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-@@ -138,7 +239,7 @@
- 
-   lex|flex)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-@@ -159,28 +260,90 @@
-     fi
-     ;;
- 
-+  help2man)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+    fi
-+    if [ -f "$file" ]; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit 1
-+    fi
-+    ;;
-+
-   makeinfo)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-          indirectly affecting the aspect of the manual.  The spurious
-          call might also be the consequence of using a buggy \`make' (AIX,
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-     if test -z "$file"; then
--      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
-+  tar)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case "$firstarg" in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case "$firstarg" in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-   *)
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-@@ -188,3 +351,10 @@
- esac
- 
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/install-sh	(revision 1905)
-+++ buildtools/install-sh	(revision 1948)
-@@ -1,20 +1,39 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-05-14.22
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# Copyright (C) 1994 X Consortium
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
- #
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
- # when there is no Makefile.
-@@ -23,13 +42,11 @@
- # from scratch.  It can only install one file at a time, a restriction
- # shared with many OS's install programs.
- 
--
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
- 
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
- 
- mvprog="${MVPROG-mv}"
-@@ -41,211 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
- 
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd="$cpprog"
--	    shift
--	    continue;;
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--	-d) dir_arg=true
--	    shift
--	    continue;;
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
- 
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
- 
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
- 
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
- 
--	-s) stripcmd="$stripprog"
--	    shift
--	    continue;;
-+    -d) dir_arg=true
-+        shift
-+        continue;;
- 
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
-+    --help) echo "$usage"; exit $?;;
- 
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$src" = x ]
--then
--	echo "install:	no input file specified"
--	exit 1
--else
--	true
--fi
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--	
--	if [ -d $dst ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=mkdir
--	fi
--else
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad 
--# if $src (and thus $dsttmp) contains '*'.
-+    -t) dstarg=$2
-+	shift
-+	shift
-+	continue;;
- 
--	if [ -f $src -o -d $src ]
--	then
--		true
--	else
--		echo "install:  $src does not exist"
--		exit 1
--	fi
--	
--	if [ x"$dst" = x ]
--	then
--		echo "install:	no destination specified"
--		exit 1
--	else
--		true
--	fi
-+    -T) no_target_directory=true
-+	shift
-+	continue;;
- 
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	if [ -d $dst ]
--	then
--		dst="$dst"/`basename $src`
--	else
--		true
--	fi
-+    *)  # When -d is used, all remaining arguments are directories to create.
-+	# When -t is used, the destination is already specified.
-+	test -n "$dir_arg$dstarg" && break
-+        # Otherwise, the last argument is the destination.  Remove it from $@.
-+	for arg
-+	do
-+          if test -n "$dstarg"; then
-+	    # $@ is not empty: it contains at least $arg.
-+	    set fnord "$@" "$dstarg"
-+	    shift # fnord
-+	  fi
-+	  shift # arg
-+	  dstarg=$arg
-+	done
-+	break;;
-+  esac
-+done
-+
-+if test -z "$1"; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
- fi
- 
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src ;;
-+  esac
- 
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    src=
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='	
--'
--IFS="${IFS-${defaultIFS}}"
-+    if test -d "$dst"; then
-+      mkdircmd=:
-+      chmodcmd=
-+    else
-+      mkdircmd=$mkdirprog
-+    fi
-+  else
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
- 
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+    if test -z "$dstarg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
- 
--pathcomp=''
-+    dst=$dstarg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst ;;
-+    esac
- 
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
--	shift
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dstarg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dst=$dst/`basename "$src"`
-+    fi
-+  fi
- 
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
-+  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- 
--	pathcomp="${pathcomp}/"
--done
--fi
-+  # Make sure that the destination directory exists.
- 
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
-+  # Skip lots of stat calls in the usual case.
-+  if test ! -d "$dstdir"; then
-+    defaultIFS='
-+	 '
-+    IFS="${IFS-$defaultIFS}"
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
-+    oIFS=$IFS
-+    # Some sh's can't handle IFS=/ for some reason.
-+    IFS='%'
-+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+    shift
-+    IFS=$oIFS
- 
--# If we're going to rename the final executable, determine the name now.
-+    pathcomp=
- 
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
-+    while test $# -ne 0 ; do
-+      pathcomp=$pathcomp$1
-+      shift
-+      if test ! -d "$pathcomp"; then
-+        $mkdirprog "$pathcomp"
-+	# mkdir can fail with a `File exist' error in case several
-+	# install-sh are creating the directory concurrently.  This
-+	# is OK.
-+	test -d "$pathcomp" || exit
-+      fi
-+      pathcomp=$pathcomp/
-+    done
-+  fi
- 
--# don't allow the sed command to completely eliminate the filename
-+  if test -n "$dir_arg"; then
-+    $doit $mkdircmd "$dst" \
-+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
- 
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
-+  else
-+    dstfile=`basename "$dst"`
- 
--# Make a temp file name in the proper directory.
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
- 
--	dsttmp=$dstdir/#inst.$$#
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+    trap '(exit $?); exit' 1 2 13 15
- 
--# Move or copy the file name to the temp name
-+    # Copy the file name to the temp name.
-+    $doit $cpprog "$src" "$dsttmp" &&
- 
--	$doit $instcmd $src $dsttmp &&
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+    # Now rename the file to the real destination.
-+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+      || {
-+	   # The rename failed, perhaps because mv can't rename something else
-+	   # to itself, or perhaps because mv is so ancient that it does not
-+	   # support -f.
- 
--# and set any options; do chmod last to preserve setuid bits
-+	   # Now remove or move aside any old file at destination location.
-+	   # We try this two ways since rm can't unlink itself on some
-+	   # systems and the destination file might be busy for other
-+	   # reasons.  In this case, the final cleanup might fail but the new
-+	   # file should still install successfully.
-+	   {
-+	     if test -f "$dstdir/$dstfile"; then
-+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+	       || {
-+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		 (exit 1); exit 1
-+	       }
-+	     else
-+	       :
-+	     fi
-+	   } &&
- 
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
-+	   # Now rename the file to the real destination.
-+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	 }
-+    }
-+  fi || { (exit 1); exit 1; }
-+done
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+  (exit 0); exit 0
-+}
- 
--# Now rename the file to the real destination.
--
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
--
--fi &&
--
--
--exit 0
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- configure	(revision 1905)
-+++ configure	(revision 1948)
-@@ -278,15 +278,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -463,7 +463,7 @@
- # 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
-+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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1023,8 +1023,10 @@
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-shared[=PKGS]
-                           build shared libraries [default=yes]
-   --enable-static[=PKGS]
-@@ -1526,22 +1528,9 @@
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
--
-           ac_config_headers="$ac_config_headers config.h:config.in"
- 
--          ac_config_commands="$ac_config_commands default-1"
--
--echo "$as_me:$LINENO: result:
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&5
--echo "${ECHO_T}
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&6
--
-+am__api_version="1.9"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -1625,20 +1614,21 @@
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
--echo timestamp > conftestfile
-+echo timestamp > conftest.file
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
--   if test "$*" != "X $srcdir/configure conftestfile" \
--      && test "$*" != "X conftestfile $srcdir/configure"; then
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-       # If neither matched, then we have a broken ls.  This can happen
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-@@ -1651,7 +1641,7 @@
-    { (exit 1); exit 1; }; }
-    fi
- 
--   test "$2" = conftestfile
-+   test "$2" = conftest.file
-    )
- then
-    # Ok.
-@@ -1663,7 +1653,6 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-@@ -1679,6 +1668,92 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$AWK" && break
-+done
-+
- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-@@ -1708,17 +1783,38 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
- 
--PACKAGE=dbmail
--
--VERSION=2.0.7
--
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=dbmail
-+ VERSION=2.0.7
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
- _ACEOF
-@@ -1728,85 +1824,124 @@
- #define VERSION "$VERSION"
- _ACEOF
- 
-+# Some tools Automake needs.
- 
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
- 
--missing_dir=`cd $ac_aux_dir && pwd`
--echo "$as_me:$LINENO: checking for working aclocal" >&5
--echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
- fi
--
--echo "$as_me:$LINENO: checking for working autoconf" >&5
--echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working automake" >&5
--echo $ECHO_N "checking for working automake... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   AUTOMAKE="$missing_dir/missing automake"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
--
--echo "$as_me:$LINENO: checking for working autoheader" >&5
--echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
- else
--   AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working makeinfo" >&5
--echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
--   MAKEINFO=makeinfo
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+  STRIP=$ac_ct_STRIP
- else
--   MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  STRIP="$ac_cv_prog_STRIP"
- fi
- 
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
- 
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
- echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-@@ -1827,6 +1962,7 @@
-   MAINTAINER_MODE_TRUE='#'
-   MAINTAINER_MODE_FALSE=
- fi
-+
-   MAINT=$MAINTAINER_MODE_TRUE
- 
- 
-@@ -2109,6 +2245,71 @@
- echo "${ECHO_T}using SQL authentication" >&6
- fi
- 
-+DEPDIR="${am__leading_dot}deps"
-+
-+          ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+  enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3033,7 +3234,116 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
- 
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
-@@ -5472,6 +5782,115 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
- echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6
- if test -n "$CXX"
-@@ -5684,6 +6103,7 @@
- fi
- 
- 
-+
- if test -n "$MYSQLINC"; then
-   MYSQL_TRUE=
-   MYSQL_FALSE='#'
-@@ -5693,6 +6113,7 @@
- fi
- 
- 
-+
- if test -n "$PGSQLINC"; then
-   PGSQL_TRUE=
-   PGSQL_FALSE='#'
-@@ -5702,6 +6123,7 @@
- fi
- 
- 
-+
- if test -n "$SIEVEINC"; then
-   SIEVE_TRUE=
-   SIEVE_FALSE='#'
-@@ -5711,6 +6133,7 @@
- fi
- 
- 
-+
- if test -n "$LDAPINC"; then
-   LDAP_TRUE=
-   LDAP_FALSE='#'
-@@ -5718,6 +6141,7 @@
-   LDAP_TRUE='#'
-   LDAP_FALSE=
- fi
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-@@ -6409,7 +6833,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6434,10 +6858,10 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- 
- fi
- 
-+SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -6499,7 +6923,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -6533,7 +6957,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -6563,6 +6987,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- 
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -6649,7 +7082,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -6672,13 +7105,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -6694,7 +7127,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -6744,12 +7177,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -6841,7 +7272,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6844 "configure"' > conftest.$ac_ext
-+  echo '#line 7275 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6884,7 +7315,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -7502,7 +7933,121 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--ac_ext=cc
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7732,7 +8277,9 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+fi
- 
-+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7825,7 +8372,7 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:7828:" \
-+echo "$as_me:8375:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8013,11 +8560,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -8063,9 +8637,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -8087,6 +8658,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDGIRSTW]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
-@@ -8118,8 +8696,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -8281,7 +8862,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
-@@ -8301,7 +8882,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8586,6 +9167,17 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -8611,7 +9203,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8673,7 +9265,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8772,6 +9364,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8808,11 +9414,16 @@
-    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works=yes
-+       fi
-      else
-        lt_prog_compiler_static_works=yes
-      fi
-@@ -8854,18 +9465,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8860: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8864: \$? = $ac_status" >&5
-+   echo "$as_me:9475: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -8942,7 +9555,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -8968,6 +9581,16 @@
- 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic='-qnocommon'
-+         lt_prog_compiler_wl='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -8979,7 +9602,7 @@
-       lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9003,12 +9626,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-@@ -9029,9 +9659,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -9053,6 +9688,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic='-pic'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9087,18 +9727,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9097: \$? = $ac_status" >&5
-+   echo "$as_me:9737: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works=yes
-      fi
-    fi
-@@ -9119,7 +9761,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic=
-@@ -9147,23 +9789,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9153: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9795: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9157: \$? = $ac_status" >&5
-+   echo "$as_me:9799: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -9239,6 +9883,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -9259,6 +9913,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -9309,7 +9984,7 @@
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -9327,6 +10002,38 @@
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -9365,32 +10072,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds="$tmp_archive_cmds"
--      fi
--      link_all_deplibs=no
--    else
--      ld_shlibs=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -9401,16 +10082,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9474,7 +10150,7 @@
-       link_all_deplibs=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9495,6 +10171,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9639,7 +10318,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec=' '
- 	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -9653,7 +10332,7 @@
-       ld_shlibs=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
-@@ -9679,52 +10358,52 @@
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
-+      whole_archive_flag_spec=''
-       link_all_deplibs=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -9758,7 +10437,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -9783,7 +10462,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -9792,7 +10471,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -9802,7 +10481,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9869,6 +10548,7 @@
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec='${wl}-E'
-       else
-@@ -9914,7 +10594,7 @@
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9933,10 +10613,12 @@
-     solaris*)
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -9945,8 +10627,18 @@
-       hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs=yes
-       ;;
-@@ -10220,7 +10912,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10248,7 +10940,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -10278,7 +10971,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -10301,7 +10994,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10336,8 +11029,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10355,7 +11057,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -10382,7 +11084,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -10481,7 +11183,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -10556,7 +11258,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -10678,8 +11384,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
-+   test -n "$runpath_var" || \
-+   test "X$hardcode_automatic" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct" != no &&
-@@ -11338,7 +12044,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11341 "configure"
-+#line 12047 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11404,7 +12110,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11436,7 +12142,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11439 "configure"
-+#line 12145 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11502,7 +12208,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11552,7 +12258,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -11565,43 +12271,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
-     ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11731,7 +12400,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -11742,11 +12411,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -11776,7 +12445,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -11852,7 +12527,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -12147,7 +12822,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12184,7 +12861,7 @@
- compiler_lib_search_path_CXX=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -12205,6 +12882,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -12226,8 +12917,17 @@
- CC=${CXX-"c++"}
- compiler=$CC
- compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
-@@ -12297,7 +12997,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -12331,7 +13031,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -12440,7 +13140,7 @@
-     link_all_deplibs_CXX=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.012|aix4.012.*)
-+      case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12461,6 +13161,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -12606,7 +13309,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	whole_archive_flag_spec_CXX=' '
- 	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -12620,6 +13323,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -12643,65 +13347,76 @@
-       ld_shlibs_CXX=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_CXX='-undefined dynamic_lookup'
--            ;;
--        esac
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        ;;
- 
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--  else
--    ld_shlibs_CXX=no
--  fi
--    ;;
--
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -12712,14 +13427,14 @@
- 	;;
-     esac
-     ;;
--  freebsd12*)
-+  freebsd[12]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -12736,11 +13451,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
--    aCC)
-+    aCC*)
-       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -12750,7 +13465,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -12764,7 +13479,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12780,7 +13495,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       hardcode_direct_CXX=no
-       hardcode_shlibpath_var_CXX=no
-@@ -12801,12 +13516,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -12827,7 +13542,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -12845,9 +13560,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12858,7 +13573,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -12871,7 +13586,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12896,17 +13611,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -12937,7 +13676,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -12958,9 +13697,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    ld_shlibs_CXX=no
-+    ;;
-+  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12976,14 +13731,14 @@
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13001,7 +13756,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13020,7 +13775,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -13035,17 +13790,17 @@
- 	# the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13064,7 +13819,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13088,7 +13843,7 @@
-   sco*)
-     archive_cmds_need_lc_CXX=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13100,12 +13855,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13118,36 +13873,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        archive_cmds_need_lc_CXX=yes
- 	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
- 	case $host_os in
--	  solaris2.0-5 | solaris2.0-5.*) ;;
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	link_all_deplibs_CXX=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13155,7 +13907,7 @@
- 	# in the archive.
- 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -13198,7 +13950,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13251,7 +14003,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -13327,6 +14079,20 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+
-+
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13382,7 +14148,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -13407,18 +14173,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13426,22 +14202,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      lt_prog_compiler_pic_CXX='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -13456,7 +14232,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -13467,18 +14243,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13495,7 +14277,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    lt_prog_compiler_pic_CXX='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -13506,14 +14288,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13529,7 +14311,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  *)
-@@ -13538,13 +14320,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    lt_prog_compiler_wl_CXX='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-PIC'
- 	    ;;
-@@ -13554,12 +14336,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13569,7 +14351,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
-@@ -13610,18 +14392,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:13620: \$? = $ac_status" >&5
-+   echo "$as_me:14402: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-@@ -13642,7 +14426,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_CXX=
-@@ -13670,23 +14454,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:13680: \$? = $ac_status" >&5
-+   echo "$as_me:14464: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -13741,7 +14527,7 @@
-     export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     link_all_deplibs_CXX=no
-@@ -13924,7 +14710,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13952,7 +14738,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -13982,7 +14769,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -14005,7 +14792,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14040,8 +14827,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14059,7 +14855,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -14086,7 +14882,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -14185,7 +14981,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -14260,7 +15056,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -14382,8 +15182,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_CXX" != no &&
-@@ -15042,7 +15842,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15045 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15108,7 +15908,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15140,7 +15940,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15143 "configure"
-+#line 15943 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15206,7 +16006,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15358,7 +16158,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -15434,7 +16240,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -15715,13 +16521,36 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -15733,7 +16562,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -15742,7 +16571,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15819,7 +16650,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15845,6 +16676,16 @@
- 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_F77='-qnocommon'
-+         lt_prog_compiler_wl_F77='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -15856,7 +16697,7 @@
-       lt_prog_compiler_wl_F77='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15880,12 +16721,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_F77='-Wl,'
-+	lt_prog_compiler_pic_F77='-fpic'
-+	lt_prog_compiler_static_F77='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-@@ -15906,9 +16754,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_F77='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_F77='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -15930,6 +16783,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -15964,18 +16822,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15970: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15974: \$? = $ac_status" >&5
-+   echo "$as_me:16832: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-@@ -15996,7 +16856,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_F77=
-@@ -16024,23 +16884,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16034: \$? = $ac_status" >&5
-+   echo "$as_me:16894: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_F77=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -16116,6 +16978,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -16136,6 +17008,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_F77=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -16186,7 +17079,7 @@
-       allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=no
-       enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -16200,10 +17093,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_F77=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_F77=no
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16242,32 +17167,6 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_F77="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_F77="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_F77=no
--    else
--      ld_shlibs_F77=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16278,16 +17177,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
-+    if test "$ld_shlibs_F77" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_F77=
-+      export_dynamic_flag_spec_F77=
-+      whole_archive_flag_spec_F77=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16351,7 +17245,7 @@
-       link_all_deplibs_F77=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16372,6 +17266,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -16496,7 +17393,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_F77=' '
- 	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -16510,7 +17407,7 @@
-       ld_shlibs_F77=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
- 
-@@ -16531,57 +17428,57 @@
-       old_archive_From_new_cmds_F77='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_F77=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_F77='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
-+      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_F77=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_F77=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -16615,7 +17512,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -16640,7 +17537,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -16649,7 +17546,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -16659,7 +17556,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16726,6 +17623,7 @@
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_F77='${wl}-E'
-       else
-@@ -16771,7 +17669,7 @@
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16790,10 +17688,12 @@
-     solaris*)
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16802,8 +17702,18 @@
-       hardcode_shlibpath_var_F77=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_F77=yes
-       ;;
-@@ -17077,7 +17987,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17105,7 +18015,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -17135,7 +18046,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17158,7 +18069,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17193,8 +18104,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17212,7 +18132,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -17239,7 +18159,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -17338,7 +18258,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -17413,7 +18333,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -17535,8 +18459,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
-+   test -n "$runpath_var_F77" || \
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_F77" != no &&
-@@ -17713,7 +18637,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -17789,7 +18719,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -18027,7 +18957,7 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
-@@ -18038,16 +18968,42 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- compiler_GCJ=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- archive_cmds_need_lc_GCJ=no
- 
-+old_archive_cmds_GCJ=$old_archive_cmds
- 
-+
- lt_prog_compiler_no_builtin_flag_GCJ=
- 
- if test "$GCC" = yes; then
-@@ -18069,18 +19025,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18075: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19031: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18079: \$? = $ac_status" >&5
-+   echo "$as_me:19035: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -18157,7 +19115,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18183,6 +19141,16 @@
- 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18194,7 +19162,7 @@
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18218,12 +19186,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-fpic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-@@ -18244,9 +19219,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_GCJ='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -18268,6 +19248,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_GCJ='-pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18302,18 +19287,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19293: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18312: \$? = $ac_status" >&5
-+   echo "$as_me:19297: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-@@ -18334,7 +19321,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_GCJ=
-@@ -18362,23 +19349,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18368: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19355: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18372: \$? = $ac_status" >&5
-+   echo "$as_me:19359: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_GCJ=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -18454,6 +19443,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -18474,6 +19473,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -18524,7 +19544,7 @@
-       allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=no
-       enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -18538,10 +19558,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_GCJ=no
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18580,32 +19632,6 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_GCJ="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_GCJ=no
--    else
--      ld_shlibs_GCJ=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18616,16 +19642,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_GCJ" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--      fi
-+    if test "$ld_shlibs_GCJ" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_GCJ=
-+      export_dynamic_flag_spec_GCJ=
-+      whole_archive_flag_spec_GCJ=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18689,7 +19710,7 @@
-       link_all_deplibs_GCJ=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18710,6 +19731,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -18854,7 +19878,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_GCJ=' '
- 	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -18868,7 +19892,7 @@
-       ld_shlibs_GCJ=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
- 
-@@ -18889,57 +19913,57 @@
-       old_archive_From_new_cmds_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_GCJ=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_GCJ=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_GCJ=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_GCJ=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -18973,7 +19997,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -18998,7 +20022,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -19007,7 +20031,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -19017,7 +20041,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19084,6 +20108,7 @@
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-@@ -19129,7 +20154,7 @@
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19148,10 +20173,12 @@
-     solaris*)
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19160,8 +20187,18 @@
-       hardcode_shlibpath_var_GCJ=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_GCJ=yes
-       ;;
-@@ -19435,7 +20472,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19463,7 +20500,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -19493,7 +20531,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -19516,7 +20554,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19551,8 +20589,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19570,7 +20617,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -19597,7 +20644,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -19696,7 +20743,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -19771,7 +20818,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -19893,8 +20944,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var GCJ" || \
--   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-+   test -n "$runpath_var_GCJ" || \
-+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_GCJ" != no &&
-@@ -20553,7 +21604,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20556 "configure"
-+#line 21607 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20619,7 +21670,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20651,7 +21702,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20654 "configure"
-+#line 21705 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20717,7 +21768,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20869,7 +21920,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -20945,7 +22002,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21193,11 +22250,35 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- compiler_RC=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
- lt_cv_prog_compiler_c_o_RC=yes
- 
- # The else clause should only fire when bootstrapping the
-@@ -21314,7 +22395,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -21390,7 +22477,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21758,6 +22845,76 @@
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${USE_DM_GETOPT_TRUE}" && test -z "${USE_DM_GETOPT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${MYSQL_TRUE}" && test -z "${MYSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${PGSQL_TRUE}" && test -z "${PGSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${SIEVE_TRUE}" && test -z "${SIEVE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -22191,8 +23348,8 @@
- # INIT-COMMANDS section.
- #
- 
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--
- _ACEOF
- 
- 
-@@ -22208,7 +23365,7 @@
-   "auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES auth/Makefile" ;;
-   "sort/Makefile" ) CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;;
-   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -22298,6 +23455,7 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -22305,7 +23463,17 @@
- s,@AUTOMAKE@,$AUTOMAKE,;t t
- s,@AUTOHEADER@,$AUTOHEADER,;t t
- s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@mkdir_p@,$mkdir_p,;t t
-+s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@am__tar@,$am__tar,;t t
-+s,@am__untar@,$am__untar,;t t
- s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
- s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
- s,@MAINT@,$MAINT,;t t
-@@ -22318,6 +23486,15 @@
- s,@ac_ct_CC@,$ac_ct_CC,;t t
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
-@@ -22359,11 +23536,12 @@
- s,@ac_ct_AR@,$ac_ct_AR,;t t
- s,@RANLIB@,$RANLIB,;t t
- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
- s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@F77@,$F77,;t t
- s,@FFLAGS@,$FFLAGS,;t t
-@@ -22830,7 +24008,29 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
- done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
-+	 X$ac_file : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- 
-@@ -22946,7 +24146,91 @@
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
- echo "$as_me: executing $ac_dest commands" >&6;}
-   case $ac_dest in
--    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
-+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    { if $as_mkdir_p; then
-+    mkdir -p $dirpart/$fdir
-+  else
-+    as_dir=$dirpart/$fdir
-+    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 $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
-   esac
- done
- _ACEOF
---- INSTALL.dbmail	(revision 0)
-+++ INSTALL.dbmail	(revision 1948)
-@@ -0,0 +1,210 @@
-+/* $Id: INSTALL 1606 2005-02-23 15:46:03Z paul $ 
-+   (c) 2000-2002 IC&S, The Netherlands */
-+
-+DBMAIL installation
-+===================
-+
-+This file describes the installation of DBMail. To read about extra 
-+features in dbmail you should consult the EXTRAS file.
-+Remember, DBmail is easy to install, as long as you exactly follow
-+these instructions.
-+
-+What do you need?
-+
-+- a working mysql (> 4.0.14) or postgresql installation
-+- a working smtp server (Postfix, Exim, QMail or Sendmail)
-+- the DBMail source (www.dbmail.org)
-+- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
-+  *BSD systems, make sure you install and use 'gmake'. 
-+- development files (libs, scripts and include files) for your database
-+  server. These will probably be provided by separate packages.
-+    
-+
-+1.	Setup a database
-+
-+	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
-+	MySQL is supported from version 4.0.14 upwards. Earlier versions of
-+	MySQL lack some SQL features that are needed for DBMail, like support
-+	for the INSERT...SELECT statement.
-+
-+	Mysql setup
-+	-----------
-+
-+	Note: Since some DBMail tables can get VERY large (depending on your
-+	mailusage) we advise using InnoDB as database storage backend.
-+	
-+	First you'll need to create the DBMail database in MYSQL. You can
-+	do this by issueing the following command. This step is only
-+	necessary when you do not have a database for DBMail yet. Note that
-+	you will be prompted for the MySQL root password.
-+
-+	mysqladmin create dbmail -u root -p
-+
-+	This creates a database with the name "dbmail". Now you have to give
-+	a non-root user access to this database. Start the MySQL command-line
-+	client as root:
-+
-+	mysql -u root -p 
-+
-+	and enter the following command:
-+
-+	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+
-+	Where <pass> should be replaced with the password you want for
-+	the dbmail user. After this step, the database is ready to be
-+	used by the dbmail user. The next step is the creation of the
-+	database tables used by DBMail. Log out of the MySQL client and run 
-+	the following command from the command line. You will have to
-+	enter the password you set in the previous step.
-+
-+	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+
-+	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
-+	create_tables.mysql. This is not recommended though. In future
-+	versions, DBMail will only support MySQL with transaction support,
-+	which is only given by InnoDB at the moment.
-+	
-+	After this, the DBMAIL tables will have been created and we can go
-+	on to the compilation and installation of DBMail itself.
-+
-+	Postgresql setup
-+	----------------
-+	
-+	First you need to create the postgresql user dbmail is going to use.
-+	This is done by. Note that this command can only be performed by
-+	user postgres or another PostgreSQL user with the privileges to
-+	create users and and databases.
-+
-+	createuser -U postgres dbmail
-+
-+	Off course you can use an other username than dbmail, simply replace
-+	it. You can set a password for the user by doing a:
-+
-+	ALTER USER dbmail WITH PASSWORD '<password>';
-+
-+	In a postgresql console, with <password> replaced by the actual 
-+	password you want to use. After doing this you should create the
-+	database for dbmail:
-+
-+	createdb -U dbmail dbmail
-+
-+	The first dbmail is the user you just created, the second the name of
-+	the database.  Of course you can use an other databasename. After
-+	setting up the user and database it's time to create the tables, do a:
-+
-+	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+
-+	Don't forget to start postgresql with the -i option, so it accepts
-+	TCP/IP connections.
-+
-+2. 	Set the database settings
-+
-+	Copy the dbmail.conf file to /etc
-+	Edit the dbmail.conf file and set everything in there
-+	to your likeings.
-+
-+	Make sure to set your database name, user and host are configured
-+	in dbmail.conf. Other options in the configuration file are 
-+	documented there.
-+
-+3.	Run configure & make
-+	Run the configure script. This script uses pg_config or mysql_config
-+	(depending on --with-mysql or --with-pgsql) to detect where the
-+	libraries and include files for these databases are.
-+
-+	e.g. when working with PostgreSQL, this is the configure command:
-+
-+	./configure --with-pgsql
-+
-+	After running configure, 'make all' will build the executables.
-+	
-+	Running 'make install' will install the executables in /usr/local/sbin
-+
-+4.	Create users in the dbmail system
-+
-+	Next you will need to create some users into the dbmail mailing sytem.
-+	Currently this can be done in two ways. One way is using the
-+	dbmail-users utility. The other way is doing it in the database
-+	itself. To do it using the dbmail-users utility and do the following:
-+
-+	dbmail-users -a <username> -w <password> -g <clientid>\
-+	             -m <maxmail> [-s aliases]
-+	
-+	clientid can be left 0 (this is if you want certain mailadministrators
-+	administer specific groups of mailusers). maxmail is the maximum
-+	number of bytes this user may have in his/her mailboxes. 0 is
-+	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
-+	number of aliases for this user. @domain are domain aliases. 
-+	A user always needs to have at least one alias to receive mail, unless
-+	the users username is something like foo@bar.org, where bar.org is 
-+	a domain the mailserver deliveres to.
-+	
-+	example: 
-+	./dbmail-users -a john -w secret -g 0 -m 25M\
-+	               -s john@dude.org john@dude.net @net.com
-+	
-+	This will create a user john, with a password secret. It will set
-+	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
-+	and @net.com will be sent to john. The @net.com is a fallback alias.
-+	This means that all mail that cannot be delivered to an existing alias
-+	for a @net.com address will sent to john.
-+
-+5.	Configure your MTA 
-+
-+	There are two ways to connect your MTA to DBMail. The MTA can start a
-+	dbmail-smtp process and pipe SMTP commands and messages to it, or it
-+	can use lmtp (Local Mail Transport Protocol) to deliver via
-+	dbmail-lmtpd. LMTP is the preferred solution because it offers more
-+	robust error handling and because it is a daemon, high traffic servers
-+	will have reduced delays which would be incurred starting up a
-+	dbmail-smtp process for each message.
-+
-+	The specifics of delivering to DBMail from your MTA can be found in
-+	the INSTALL.<MTA Name> files. Currently there is documentation for
-+	Postfix and Exim.
-+
-+	If you use a different kind of mta that we do not have documentation
-+	for: The dbmail injector program, dbmail-smtp, can receive information
-+	in two ways. Either through raw mail (for example, delivered by
-+	procmail) using the -n option or from a MTA with recipients in the
-+	commandline using the -d option. Be carefull, the -n option is not
-+	fully tested and may behave unexected. If possible use the -d option.
-+
-+	Setup for LMTP should be straightforward if your MTA supports it.
-+
-+6.	Setting up the maintenance run
-+
-+	The dbmail daemons and the smtp injector itself will never actually
-+	delete mail from the database. The only program that will do this is
-+	the dbmail-util program. This program will also check the
-+	integrity of the dbmail database and, if nescessary, fix it. The
-+	dbmail-util program will first delete all messages that are set
-+	for final deletion. After that it will set all messages that have the
-+	delete status set to status final deletion. This way dbmail always
-+	has a backup based upon the interval difference between maintenance
-+	jobs. We recommend running the dbmail-util program in a daily
-+	interval from cron:
-+
-+	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
-+	
-+7.	Starting the servers
-+
-+	If you want users to be able to retrieve email via IMAP or POP3, run
-+	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
-+	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+
-+8.	Problems
-+	--------
-+	For problems you can subscribe to the dbmail mailinglist: 
-+	http://mailman.fastxs.nl/mailman/listinfo/dbmail
-+	
-+	Please always check the archives first.
-+
-+	or check out the dbmail website at http://www.dbmail.org.
-+
-+	Please note that DBMail logs a lot of relevant data to the maillog
-+	(often located at /var/log/maillog or /var/log/mail.log). This can
-+	help you often if something is not working, e.g. if there's no
-+	connection to the database.  
-+
-+
---- INSTALL	(revision 1905)
-+++ INSTALL	(revision 1948)
-@@ -1,210 +1,236 @@
--/* $Id$ 
--   (c) 2000-2002 IC&S, The Netherlands */
-+Installation Instructions
-+*************************
- 
--DBMAIL installation
--===================
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-+Software Foundation, Inc.
- 
--This file describes the installation of DBMail. To read about extra 
--features in dbmail you should consult the EXTRAS file.
--Remember, DBmail is easy to install, as long as you exactly follow
--these instructions.
-+This file is free documentation; the Free Software Foundation gives
-+unlimited permission to copy, distribute and modify it.
- 
--What do you need?
-+Basic Installation
-+==================
- 
--- a working mysql (> 4.0.14) or postgresql installation
--- a working smtp server (Postfix, Exim, QMail or Sendmail)
--- the DBMail source (www.dbmail.org)
--- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
--  *BSD systems, make sure you install and use 'gmake'. 
--- development files (libs, scripts and include files) for your database
--  server. These will probably be provided by separate packages.
--    
-+These are generic installation instructions.
- 
--1.	Setup a database
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
- 
--	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
--	MySQL is supported from version 4.0.14 upwards. Earlier versions of
--	MySQL lack some SQL features that are needed for DBMail, like support
--	for the INSERT...SELECT statement.
-+   It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring.  (Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.)
- 
--	Mysql setup
--	-----------
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
- 
--	Note: Since some DBMail tables can get VERY large (depending on your
--	mailusage) we advise using InnoDB as database storage backend.
--	
--	First you'll need to create the DBMail database in MYSQL. You can
--	do this by issueing the following command. This step is only
--	necessary when you do not have a database for DBMail yet. Note that
--	you will be prompted for the MySQL root password.
-+   The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'.  You only need
-+`configure.ac' if you want to change it or regenerate `configure' using
-+a newer version of `autoconf'.
- 
--	mysqladmin create dbmail -u root -p
-+The simplest way to compile this package is:
- 
--	This creates a database with the name "dbmail". Now you have to give
--	a non-root user access to this database. Start the MySQL command-line
--	client as root:
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
- 
--	mysql -u root -p 
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
- 
--	and enter the following command:
-+  2. Type `make' to compile the package.
- 
--	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
- 
--	Where <pass> should be replaced with the password you want for
--	the dbmail user. After this step, the database is ready to be
--	used by the dbmail user. The next step is the creation of the
--	database tables used by DBMail. Log out of the MySQL client and run 
--	the following command from the command line. You will have to
--	enter the password you set in the previous step.
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
- 
--	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
- 
--	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
--	create_tables.mysql. This is not recommended though. In future
--	versions, DBMail will only support MySQL with transaction support,
--	which is only given by InnoDB at the moment.
--	
--	After this, the DBMAIL tables will have been created and we can go
--	on to the compilation and installation of DBMail itself.
-+Compilers and Options
-+=====================
- 
--	Postgresql setup
--	----------------
--	
--	First you need to create the postgresql user dbmail is going to use.
--	This is done by. Note that this command can only be performed by
--	user postgres or another PostgreSQL user with the privileges to
--	create users and and databases.
-+Some systems require unusual options for compilation or linking that the
-+`configure' script does not know about.  Run `./configure --help' for
-+details on some of the pertinent environment variables.
- 
--	createuser -U postgres dbmail
-+   You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment.  Here
-+is an example:
- 
--	Off course you can use an other username than dbmail, simply replace
--	it. You can set a password for the user by doing a:
-+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
- 
--	ALTER USER dbmail WITH PASSWORD '<password>';
-+   *Note Defining Variables::, for more details.
- 
--	In a postgresql console, with <password> replaced by the actual 
--	password you want to use. After doing this you should create the
--	database for dbmail:
-+Compiling For Multiple Architectures
-+====================================
- 
--	createdb -U dbmail dbmail
-+You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
- 
--	The first dbmail is the user you just created, the second the name of
--	the database.  Of course you can use an other databasename. After
--	setting up the user and database it's time to create the tables, do a:
-+   If you have to use a `make' that does not support the `VPATH'
-+variable, you have to compile the package for one architecture at a
-+time in the source code directory.  After you have installed the
-+package for one architecture, use `make distclean' before reconfiguring
-+for another architecture.
- 
--	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+Installation Names
-+==================
- 
--	Don't forget to start postgresql with the -i option, so it accepts
--	TCP/IP connections.
-+By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
- 
--2. 	Set the database settings
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
- 
--	Copy the dbmail.conf file to /etc
--	Edit the dbmail.conf file and set everything in there
--	to your likeings.
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
- 
--	Make sure to set your database name, user and host are configured
--	in dbmail.conf. Other options in the configuration file are 
--	documented there.
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
- 
--3.	Run configure & make
--	Run the configure script. This script uses pg_config or mysql_config
--	(depending on --with-mysql or --with-pgsql) to detect where the
--	libraries and include files for these databases are.
-+Optional Features
-+=================
- 
--	e.g. when working with PostgreSQL, this is the configure command:
-+Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
- 
--	./configure --with-pgsql
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
- 
--	After running configure, 'make all' will build the executables.
--	
--	Running 'make install' will install the executables in /usr/local/sbin
-+Specifying the System Type
-+==========================
- 
--4.	Create users in the dbmail system
-+There may be some features `configure' cannot figure out automatically,
-+but needs to determine by the type of machine the package will run on.
-+Usually, assuming the package is built to be run on the _same_
-+architectures, `configure' can figure that out, but if it prints a
-+message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
- 
--	Next you will need to create some users into the dbmail mailing sytem.
--	Currently this can be done in two ways. One way is using the
--	dbmail-users utility. The other way is doing it in the database
--	itself. To do it using the dbmail-users utility and do the following:
-+     CPU-COMPANY-SYSTEM
- 
--	dbmail-users -a <username> -w <password> -g <clientid>\
--	             -m <maxmail> [-s aliases]
--	
--	clientid can be left 0 (this is if you want certain mailadministrators
--	administer specific groups of mailusers). maxmail is the maximum
--	number of bytes this user may have in his/her mailboxes. 0 is
--	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
--	number of aliases for this user. @domain are domain aliases. 
--	A user always needs to have at least one alias to receive mail, unless
--	the users username is something like foo@bar.org, where bar.org is 
--	a domain the mailserver deliveres to.
--	
--	example: 
--	./dbmail-users -a john -w secret -g 0 -m 25M\
--	               -s john@dude.org john@dude.net @net.com
--	
--	This will create a user john, with a password secret. It will set
--	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
--	and @net.com will be sent to john. The @net.com is a fallback alias.
--	This means that all mail that cannot be delivered to an existing alias
--	for a @net.com address will sent to john.
-+where SYSTEM can have one of these forms:
- 
--5.	Configure your MTA 
-+     OS KERNEL-OS
- 
--	There are two ways to connect your MTA to DBMail. The MTA can start a
--	dbmail-smtp process and pipe SMTP commands and messages to it, or it
--	can use lmtp (Local Mail Transport Protocol) to deliver via
--	dbmail-lmtpd. LMTP is the preferred solution because it offers more
--	robust error handling and because it is a daemon, high traffic servers
--	will have reduced delays which would be incurred starting up a
--	dbmail-smtp process for each message.
-+   See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
- 
--	The specifics of delivering to DBMail from your MTA can be found in
--	the INSTALL.<MTA Name> files. Currently there is documentation for
--	Postfix and Exim.
-+   If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
- 
--	If you use a different kind of mta that we do not have documentation
--	for: The dbmail injector program, dbmail-smtp, can receive information
--	in two ways. Either through raw mail (for example, delivered by
--	procmail) using the -n option or from a MTA with recipients in the
--	commandline using the -d option. Be carefull, the -n option is not
--	fully tested and may behave unexected. If possible use the -d option.
-+   If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
- 
--	Setup for LMTP should be straightforward if your MTA supports it.
-+Sharing Defaults
-+================
- 
--6.	Setting up the maintenance run
-+If you want to set default values for `configure' scripts to share, you
-+can create a site shell script called `config.site' that gives default
-+values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
- 
--	The dbmail daemons and the smtp injector itself will never actually
--	delete mail from the database. The only program that will do this is
--	the dbmail-util program. This program will also check the
--	integrity of the dbmail database and, if nescessary, fix it. The
--	dbmail-util program will first delete all messages that are set
--	for final deletion. After that it will set all messages that have the
--	delete status set to status final deletion. This way dbmail always
--	has a backup based upon the interval difference between maintenance
--	jobs. We recommend running the dbmail-util program in a daily
--	interval from cron:
-+Defining Variables
-+==================
- 
--	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
--	
--7.	Starting the servers
-+Variables not defined in a site shell script can be set in the
-+environment passed to `configure'.  However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost.  In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'.  For example:
- 
--	If you want users to be able to retrieve email via IMAP or POP3, run
--	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
--	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+     ./configure CC=/usr/local2/bin/gcc
- 
--8.	Problems
--	--------
--	For problems you can subscribe to the dbmail mailinglist: 
--	http://mailman.fastxs.nl/mailman/listinfo/dbmail
--	
--	Please always check the archives first.
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).  Here is a another example:
- 
--	or check out the dbmail website at http://www.dbmail.org.
-+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
- 
--	Please note that DBMail logs a lot of relevant data to the maillog
--	(often located at /var/log/maillog or /var/log/mail.log). This can
--	help you often if something is not working, e.g. if there's no
--	connection to the database.  
-+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-+configuration-related scripts to be executed by `/bin/bash'.
- 
-+`configure' Invocation
-+======================
- 
-+`configure' recognizes the following options to control how it operates.
-+
-+`--help'
-+`-h'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--version'
-+`-V'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`--cache-file=FILE'
-+     Enable the cache: use and save the results of the tests in FILE,
-+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-+     disable caching.
-+
-+`--config-cache'
-+`-C'
-+     Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`configure' also accepts some other, not widely useful, options.  Run
-+`configure --help' for more details.
-+
---- acinclude.m4	(revision 1905)
-+++ acinclude.m4	(revision 1948)
-@@ -4,138 +4,9 @@
- 
- # serial 1
- 
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
- dnl DBMAIL_BOTH_SQL_CHECK
- dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
-+AC_DEFUN([DBMAIL_BOTH_SQL_CHECK], [dnl
- AC_ARG_WITH(mysql,
-             [  --with-mysql            use MySQL as database. Uses mysql_config
- 	       		  for finding includes and libraries],
-@@ -187,7 +58,7 @@
- 
- dnl DBMAIL_CHECK_SQL_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SQL_LIBS], [dnl
- #Look for include files and libs needed to link
- #use the configuration utilities (mysql_config and pg_config for this)
- # MySQL first
-@@ -231,7 +102,7 @@
- ])
- dnl DBMAIL_SIEVE_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
-+AC_DEFUN([DBMAIL_SIEVE_CONF], [dnl
- AC_MSG_RESULT([checking for sorting configuration])
- AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
- 	sieveheadername="$withval$")
-@@ -287,7 +158,7 @@
- 
- dnl DBMAIL_CHECK_SIEVE_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SIEVE_LIBS], [dnl
- # Look for libs needed to link to SIEVE first
- if test ! "${sieveheadername-x}" = "x"
- then
-@@ -307,7 +178,7 @@
- 	
- dnl DBMAIL_AUTH_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
-+AC_DEFUN([DBMAIL_AUTH_CONF], [dnl
- AC_MSG_RESULT([checking for authentication configuration])
- AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
- 	authldapheadername="$withval$")
-@@ -363,7 +234,7 @@
- 
- dnl DBMAIL_CHECK_LDAP_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_LDAP_LIBS], [dnl
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
diff --git a/mail/dbmail21/files/patch-2.0.7_008 b/mail/dbmail21/files/patch-2.0.7_008
deleted file mode 100644
index ca3e9b671145..000000000000
--- a/mail/dbmail21/files/patch-2.0.7_008
+++ /dev/null
@@ -1,8766 +0,0 @@
---- pgsql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ pgsql/Makefile.in	Mon Dec 26 09:42:29 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,105 +12,140 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
--# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
--#
--# This program is free software; you can redistribute it and/or 
--# modify it under the terms of the GNU General Public License 
--# as published by the Free Software Foundation; either 
--# version 2 of the License, or (at your option) any later 
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
-+@SET_MAKE@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = pgsql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libpgsqldbmail_la_DEPENDENCIES =
-+am__libpgsqldbmail_la_SOURCES_DIST = dbpgsql.c
-+@PGSQL_TRUE@am_libpgsqldbmail_la_OBJECTS = dbpgsql.lo
-+libpgsqldbmail_la_OBJECTS = $(am_libpgsqldbmail_la_OBJECTS)
-+@PGSQL_TRUE@am_libpgsqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgsqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libpgsqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +153,167 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- 
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
-+# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
-+#
-+# This program is free software; you can redistribute it and/or 
-+# modify it under the terms of the GNU General Public License 
-+# as published by the Free Software Foundation; either 
-+# version 2 of the License, or (at your option) any later 
-+# version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- @PGSQL_TRUE@AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer
--
- @PGSQL_TRUE@pkglib_LTLIBRARIES = libpgsqldbmail.la
--
- @PGSQL_TRUE@libpgsqldbmail_la_SOURCES = dbpgsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
-+@PGSQL_TRUE@libpgsqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libpgsqldbmail_la_LDFLAGS = 
--libpgsqldbmail_la_LIBADD = 
--@PGSQL_TRUE@libpgsqldbmail_la_OBJECTS =  dbpgsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbpgsql.P
--SOURCES = $(libpgsqldbmail_la_SOURCES)
--OBJECTS = $(libpgsqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu pgsql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pgsql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  pgsql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libpgsqldbmail_la_rpath) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbpgsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = pgsql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pgsql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- buildtools/mkinstalldirs	Fri Aug 19 14:30:42 2005
-+++ buildtools/mkinstalldirs	Mon Dec 26 09:42:30 2005
-@@ -1,40 +1,158 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 802 2003-10-24 09:21:31Z ilja $
-+scriptversion=2005-06-29.22
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
- 
- errstatus=0
-+dirmode=
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
-+case $dirmode in
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
-+esac
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp"
--
--        mkdir "$pathcomp" || lasterr=$?
--
--        if test ! -d "$pathcomp"; then
--  	  errstatus=$lasterr
--        fi
--     fi
-+for file
-+do
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
--# mkinstalldirs ends here
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/ltmain.sh	Mon Aug 22 12:09:45 2005
-+++ buildtools/ltmain.sh	Mon Dec 26 09:42:30 2005
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -17,7 +17,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -43,9 +43,14 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.6
--TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-+VERSION="1.5.20 Debian 1.5.20-2"
-+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
- 
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
- 
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -83,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  SP2NL='tr \040 \012'
-+  NL2SP='tr \015\012 \040\040'
-   ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+  SP2NL='tr \100 \n'
-+  NL2SP='tr \r\n \100\100'
-   ;;
- esac
- 
-@@ -107,8 +113,9 @@
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   $echo "$modename: not configured to build any kind of library" 1>&2
-@@ -138,7 +145,8 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--func_win32_libid () {
-+func_win32_libid ()
-+{
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-@@ -178,7 +186,8 @@
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- # arg is usually of the form 'gcc ...'
--func_infer_tag () {
-+func_infer_tag ()
-+{
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
-@@ -235,6 +244,108 @@
-       esac
-     fi
- }
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+
-+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
-+}
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    ${rm}r unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd "$darwin_orig_dir"
-+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	fi # $run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+        ;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+    func_extract_archives_result="$my_oldobjs"
-+}
- # End of Shell function definitions
- #####################################
- 
-@@ -305,10 +416,10 @@
-   --version)
-     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-     $echo "This is free software; see the source for copying conditions.  There is NO"
-     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --config)
-@@ -317,7 +428,7 @@
-     for tagname in $taglist; do
-       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-     done
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --debug)
-@@ -342,7 +453,7 @@
-     else
-       $echo "disable static libraries"
-     fi
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -399,7 +510,7 @@
-   # Infer the operation mode.
-   if test -z "$mode"; then
-     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-     case $nonopt in
-     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-@@ -465,7 +576,7 @@
- 
-     for arg
-     do
--      case "$arg_mode" in
-+      case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
-@@ -547,7 +658,10 @@
-       case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
-+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+      # in scan sets (worked around with variable expansion),
-+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-+      # at all, so we specify them separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-@@ -621,6 +735,14 @@
-       esac
-     done
- 
-+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-+    case $qlibobj in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qlibobj="\"$qlibobj\"" ;;
-+    esac
-+    test "X$libobj" != "X$qlibobj" \
-+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-     if test "X$xdir" = "X$obj"; then
-@@ -693,12 +815,17 @@
- 	$run $rm $removelist
- 	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      $echo "$srcfile" > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
-+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-+    case $qsrcfile in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+      qsrcfile="\"$qsrcfile\"" ;;
-+    esac
- 
-     $run $rm "$libobj" "${libobj}T"
- 
-@@ -720,10 +847,10 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
-       if test ! -d "${xdir}$objdir"; then
-@@ -803,9 +930,9 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -1227,6 +1354,13 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        darwin_framework)
-+	  compiler_flags="$compiler_flags $arg"
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
-@@ -1285,6 +1419,14 @@
- 	continue
- 	;;
- 
-+      -framework|-arch)
-+        prev=darwin_framework
-+        compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+        continue
-+        ;;
-+
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -1345,7 +1487,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1356,7 +1498,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1366,8 +1508,20 @@
- 	continue
- 	;;
- 
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      -model)
-+	compile_command="$compile_command $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	finalize_command="$finalize_command $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	deplibs="$deplibs $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
- 	continue
- 	;;
- 
-@@ -1376,13 +1530,14 @@
- 	continue
- 	;;
- 
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m* pass through architecture-specific compiler args for GCC
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1858,7 +2013,7 @@
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    deplibs="$deplib $deplibs"
-+	    compiler_flags="$compiler_flags $deplib"
- 	  fi
- 	  continue
- 	  ;;
-@@ -1977,7 +2132,22 @@
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2051,6 +2221,8 @@
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
-+	avoidtemprpath=
-+
- 
- 	# Read the .la file
- 	case $lib in
-@@ -2149,11 +2321,19 @@
- 	    dir="$libdir"
- 	    absdir="$libdir"
- 	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
-@@ -2226,12 +2406,12 @@
- 	  if test -n "$library_names" &&
- 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath " in
- 	      *" $dir "*) ;;
- 	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      *) temp_rpath="$temp_rpath $absdir" ;;
- 	      esac
- 	    fi
- 
-@@ -2417,7 +2597,7 @@
- 		add_dir="-L$dir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
-+		  case $libdir in
- 		    [\\/]*)
- 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
-@@ -2490,7 +2670,7 @@
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
-+		case $libdir in
- 		  [\\/]*)
- 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
-@@ -2551,8 +2731,6 @@
- 	      fi
- 	    fi
- 	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
-@@ -2670,12 +2848,12 @@
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$depdepl $deplibs" ;;
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
-@@ -2947,7 +3125,7 @@
- 	case $current in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2956,7 +3134,7 @@
- 	case $revision in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2965,7 +3143,7 @@
- 	case $age in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2991,7 +3169,7 @@
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -3197,7 +3375,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -3247,7 +3425,7 @@
- 	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" -ne "0"; then
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3284,7 +3462,7 @@
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
-@@ -3336,7 +3514,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test  "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3405,7 +3583,7 @@
- 	  set dummy $deplibs_check_method
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3646,6 +3824,9 @@
- 	        # The command line is too long to execute in one step.
- 	        $show "using reloadable object file for export list..."
- 	        skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
-@@ -3679,67 +3860,13 @@
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
--
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -3769,7 +3896,8 @@
- 	  fi
- 	fi
- 
--	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" &&
-+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
-@@ -3788,6 +3916,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
-+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -3797,13 +3926,13 @@
- 	  delfiles=
- 	  last_robj=
- 	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
-+	  output=$output_objdir/$output_la-${k}.$objext
- 	  # Loop over the list of objects to be linked.
- 	  for obj in $save_libobjs
- 	  do
- 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- 	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
-+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 		 test "$len" -le "$max_cmd_len"; }; then
- 	      objlist="$objlist $obj"
- 	    else
-@@ -3817,9 +3946,9 @@
- 		# the last one created.
- 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- 	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      last_robj=$output_objdir/$output_la-${k}.$objext
- 	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
-+	      output=$output_objdir/$output_la-${k}.$objext
- 	      objlist=$obj
- 	      len=1
- 	    fi
-@@ -3839,13 +3968,13 @@
- 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
- 
--	  # Set up a command to remove the reloadale object files
-+	  # Set up a command to remove the reloadable object files
- 	  # after they are used.
- 	  i=0
- 	  while test "$i" -lt "$k"
- 	  do
- 	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- 	  done
- 
- 	  $echo "creating a temporary reloadable object file: $output"
-@@ -3893,13 +4022,30 @@
- 	  IFS="$save_ifs"
- 	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
-+	  $run eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      $show "${rm}r $gentop"
-+	      $run ${rm}r "$gentop"
-+	    fi
-+	  fi
-+
- 	  exit $EXIT_SUCCESS
- 	fi
- 
-@@ -3977,64 +4123,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -4296,12 +4388,12 @@
- 
- 	    # Prepare the list of exported symbols
- 	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
-+	      export_symbols="$output_objdir/$outputname.exp"
- 	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
- 	  fi
-@@ -4353,7 +4445,26 @@
- #endif
- 
- /* The mapping between symbol names and symbols. */
-+"
-+
-+	    case $host in
-+	    *cygwin* | *mingw* )
-+	  $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs */
-+struct {
-+"
-+	      ;;
-+	    * )
-+	  $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+	      ;;
-+	    esac
-+
-+
-+	  $echo >> "$output_objdir/$dlsyms" "\
-   const char *name;
-   lt_ptr address;
- }
-@@ -4582,7 +4693,7 @@
- 	esac
- 	case $host in
- 	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- 	    cwrapper=`$echo ${output}.exe`
- 	    $rm $cwrappersource $cwrapper
- 	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-@@ -4681,6 +4792,7 @@
- EOF
- 
- 	    cat >> $cwrappersource <<"EOF"
-+  return 127;
- }
- 
- void *
-@@ -4815,7 +4927,7 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -4944,13 +5056,13 @@
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
- 	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
-@@ -4960,7 +5072,7 @@
-     fi
-   else
-     # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit $EXIT_FAILURE
-@@ -4992,71 +5104,73 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
--	  fi
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-        cmds=$old_archive_from_new_cmds
-       else
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "copying selected object files to avoid basename conflicts..."
-+
-+	  if test -z "$gentop"; then
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	  fi
-+
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		counter=`expr $counter + 1`
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      $run ln "$obj" "$gentop/$newobj" ||
-+	      $run cp "$obj" "$gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	if len=`expr "X$cmds" : ".*"` &&
-@@ -5070,20 +5184,7 @@
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
--	  fi
-+
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
-@@ -5094,7 +5195,7 @@
- 	    oldobjs="$objlist $obj"
- 	    objlist="$objlist $obj"
- 	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
-+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	       test "$len" -le "$max_cmd_len"; then
- 	      :
- 	    else
-@@ -5291,11 +5392,11 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+       $echo "X$nonopt" | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5304,14 +5405,14 @@
-       shift
-     else
-       install_prog=
--      arg="$nonopt"
-+      arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-     case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-     esac
-@@ -5329,28 +5430,31 @@
-     do
-       if test -n "$dest"; then
- 	files="$files $dest"
--	dest="$arg"
-+	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
-+      -f) 
-+      	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o) prev=$arg ;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
--      -*) ;;
--
-+      -*)
-+	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  prev=
- 	else
--	  dest="$arg"
-+	  dest=$arg
- 	  continue
- 	fi
- 	;;
-@@ -5359,7 +5463,7 @@
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5528,11 +5632,14 @@
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- 	      fi
- 	    done
- 	  fi
-@@ -5545,7 +5652,16 @@
- 	    IFS="$save_ifs"
- 	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
-+	    $run eval "$cmd" || {
-+	      lt_exit=$?
-+
-+	      # Restore the uninstalled library and exit
-+	      if test "$mode" = relink; then
-+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	      fi
-+
-+	      exit $lt_exit
-+	    }
- 	  done
- 	  IFS="$save_ifs"
- 	fi
-@@ -5639,17 +5755,15 @@
- 	  notinst_deplibs=
- 	  relink_command=
- 
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
-@@ -5677,17 +5791,15 @@
- 	  done
- 
- 	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  outputname=
-@@ -5728,7 +5840,7 @@
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
-+	# one anyway 
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
-@@ -6398,7 +6510,7 @@
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit $EXIT_SUCCESS
-+exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
---- auth/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ auth/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1404 2004-10-14 09:13:17Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = auth
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libauthdbmail_la_DEPENDENCIES =
-+am__libauthdbmail_la_SOURCES_DIST = authsql.c authldap.c
-+@LDAP_FALSE@am_libauthdbmail_la_OBJECTS = authsql.lo
-+@LDAP_TRUE@am_libauthdbmail_la_OBJECTS = authldap.lo
-+libauthdbmail_la_OBJECTS = $(am_libauthdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libauthdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libauthdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,108 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- AM_CFLAGS = -fomit-frame-pointer
--
- pkglib_LTLIBRARIES = libauthdbmail.la
--@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
- @LDAP_FALSE@libauthdbmail_la_SOURCES = authsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libauthdbmail_la_LDFLAGS = 
--libauthdbmail_la_LIBADD = 
--@LDAP_TRUE@libauthdbmail_la_OBJECTS =  authldap.lo
--@LDAP_FALSE@libauthdbmail_la_OBJECTS =  authsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/authldap.P .deps/authsql.P
--SOURCES = $(libauthdbmail_la_SOURCES)
--OBJECTS = $(libauthdbmail_la_OBJECTS)
-+@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
-+libauthdbmail_la_LIBADD = -lcrypt @LDAPLIB@ @SQLLIB@
-+all: all-am
- 
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu auth/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  auth/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  auth/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldap.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -226,173 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = auth
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu auth/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+pdf-am:
- 
-+ps: ps-am
- 
--#libauthdbmail_la_LIBADD = -lcrypt
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- sort/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ sort/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1535 2004-12-27 09:48:06Z paul $ 
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $ 
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = sort
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libsortdbmail_la_DEPENDENCIES =
-+am__libsortdbmail_la_SOURCES_DIST = sort.c sortsieve.c
-+@SIEVE_FALSE@am_libsortdbmail_la_OBJECTS = sort.lo
-+@SIEVE_TRUE@am_libsortdbmail_la_OBJECTS = sort.lo sortsieve.lo
-+libsortdbmail_la_OBJECTS = $(am_libsortdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libsortdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libsortdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- pkglib_LTLIBRARIES = libsortdbmail.la
--@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_FALSE@libsortdbmail_la_SOURCES = sort.c
-+@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_TRUE@AM_CFLAGS = -DSIEVE
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libsortdbmail_la_LDFLAGS = 
--libsortdbmail_la_LIBADD = 
--@SIEVE_FALSE@libsortdbmail_la_OBJECTS =  sort.lo
--@SIEVE_TRUE@libsortdbmail_la_OBJECTS =  sort.lo sortsieve.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
-+libsortdbmail_la_LIBADD = @SORTLIB@
-+all: all-am
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/sort.P .deps/sortsieve.P
--SOURCES = $(libsortdbmail_la_SOURCES)
--OBJECTS = $(libsortdbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu sort/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sort/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  sort/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortsieve.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = sort
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sort/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- mysql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ mysql/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = mysql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libmysqldbmail_la_DEPENDENCIES =
-+am__libmysqldbmail_la_SOURCES_DIST = dbmysql.c
-+@MYSQL_TRUE@am_libmysqldbmail_la_OBJECTS = dbmysql.lo
-+libmysqldbmail_la_OBJECTS = $(am_libmysqldbmail_la_OBJECTS)
-+@MYSQL_TRUE@am_libmysqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libmysqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libmysqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,149 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- @MYSQL_TRUE@AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer 
--
- @MYSQL_TRUE@pkglib_LTLIBRARIES = libmysqldbmail.la
--
- @MYSQL_TRUE@libmysqldbmail_la_SOURCES = dbmysql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libmysqldbmail_la_LDFLAGS = 
--libmysqldbmail_la_LIBADD = 
--@MYSQL_TRUE@libmysqldbmail_la_OBJECTS =  dbmysql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
-+@MYSQL_TRUE@libmysqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbmysql.P
--SOURCES = $(libmysqldbmail_la_SOURCES)
--OBJECTS = $(libmysqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mysql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  mysql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libmysqldbmail_la_rpath) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmysql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = mysql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- aclocal.m4	Mon Aug 22 12:09:45 2005
-+++ aclocal.m4	Mon Dec 26 09:42:35 2005
-@@ -1,1423 +1,19 @@
--dnl aclocal.m4t generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Do all the work for Automake.  This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
--dnl DBMAIL_BOTH_SQL_CHECK
--dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
--AC_ARG_WITH(mysql,
--            [  --with-mysql            use MySQL as database. Uses mysql_config
--	       		  for finding includes and libraries],
--            mysqlheadername="$withval")
--AC_ARG_WITH(pgsql,
--	    [  --with-pgsql            use PostgreSQL as database. 
--                          Uses pg_config for finding includes and libraries],
--            pgsqlheadername="$withval")
--
--WARN=0
--# Make sure we only select one, mysql or pgsql
--if test "${mysqlheadername-x}" = "x"
--then
--  if test "${pgsqlheadername-x}" = "x"
--  then
--    NEITHER=1
--    mysqlheadername=""
--#    MYSQLINC=""
--#    PGSQLINC=""
--  fi
--fi
--if test "$NEITHER" = 1
--  then
--     AC_MSG_ERROR([
--
--     You have to specify --with-mysql or --with-pgsql to build.
--])
--fi
--
--if test ! "${mysqlheadername-x}" = "x"
--then
--  if test ! "${pgsqlheadername-x}" = "x"
--    then
--      WARN=1
--      mysqlheadername=""
--#      MYSQLINC=""
--#      PGSQLINC=""
--  fi
--fi
--if test "$WARN" = 1
--  then
--     AC_MSG_ERROR([
--
--     You cannot specify both --with-mysql and --with-pgsql on the same
--     build...
--])
--fi
--])
--
--dnl DBMAIL_CHECK_SQL_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
--#Look for include files and libs needed to link
--#use the configuration utilities (mysql_config and pg_config for this)
--# MySQL first
--if test ! "${mysqlheadername-x}" = "x"
--then
--    AC_PATH_PROG(mysqlconfig,mysql_config)
--    if test [ -z "$mysqlconfig" ]
--    then
--        AC_MSG_ERROR([mysql_config executable not found. Make sure mysql_config is in your path])
--    else
--	AC_MSG_CHECKING([MySQL headers])
--	MYSQLINC=`${mysqlconfig} --cflags`
--	AC_MSG_RESULT([$MYSQLINC])	
--        AC_MSG_CHECKING([MySQL libraries])
--        SQLLIB=`${mysqlconfig} --libs`
--        SQLALIB="mysql/.libs/libmysqldbmail.a"
--	SQLLTLIB="mysql/libmysqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--   fi
--else
--  if test ! "${pgsqlheadername-x}" = "x"
--  then
--    AC_PATH_PROG(pgsqlconfig,pg_config)
--    if test [ -z "$pgsqlconfig" ]
--    then
--        AC_MSG_ERROR([pg_config executable not found. Make sure pg_config is in your path])
--    else
--	AC_MSG_CHECKING([PostgreSQL headers])
--	PGINCDIR=`${pgsqlconfig} --includedir`
--	PGSQLINC="-I$PGINCDIR"
--	AC_MSG_RESULT([$PGSQLINC])
--        AC_MSG_CHECKING([PostgreSQL libraries])
--        PGLIBDIR=`${pgsqlconfig} --libdir`
--        SQLLIB="-L$PGLIBDIR -lpq"
--        SQLALIB="pgsql/.libs/libpgsqldbmail.a"
--	SQLLTLIB="pgsql/libpgsqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--    fi
--  fi
--fi
--])
--dnl DBMAIL_SIEVE_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
--AC_MSG_RESULT([checking for sorting configuration])
--AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
--	sieveheadername="$withval$")
--dnl This always needs to be defined
--SORTALIB="sort/.libs/libsortdbmail.a"
--SORTLTLIB="sort/libsortdbmail.la"
--
--WARN=0
--if test ! "${sieveheadername-x}" = "x"
--then
--  # --with-sieve was specified
--  AC_MSG_RESULT([using Sieve sorting])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for sieve2_interface.h (user supplied)])
--    if test -r "$sieveheadername/sieve2_interface.h"
--      then
--      # found
--        AC_MSG_RESULT([$sieveheadername/sieve2_interface.h])
--        SIEVEINC=$sieveheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        SIEVEINC=""
--        sieveheadername=""
--        AC_MSG_ERROR([
--  Unable to find sieve2_inteface.h where you specified, try just --with-sieve to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for sieve2_interface.h])
--    for sievepaths in $sieveheaderpaths
--    do
--      if test -r "$sievepaths/sieve2_interface.h"
--      then
--        SIEVEINC="$sievepaths"
--        AC_MSG_RESULT([$sievepaths/sieve2_interface.h])
--        break
--      fi
--    done
--    if test -z "$SIEVEINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate sieve2_inteface.h, try specifying with --with-sieve])
--    fi
--  fi
--else
--  AC_MSG_RESULT([not using any sorting])
--fi
--])
--
--dnl DBMAIL_CHECK_SIEVE_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
--# Look for libs needed to link to SIEVE first
--if test ! "${sieveheadername-x}" = "x"
--then
--  AC_CHECK_LIB(sieve,sieve2_listextensions,[ SIEVELIB="-lsieve"], [SIEVELIB=""])
--  if test -z "$SIEVELIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against libSieve.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no Sieve needed
--  SIEVELIB=""
--fi
--])
--	
--dnl DBMAIL_AUTH_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
--AC_MSG_RESULT([checking for authentication configuration])
--AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
--	authldapheadername="$withval$")
--dnl This always needs to be defined
--AUTHALIB="auth/.libs/libauthdbmail.a"
--AUTHLTLIB="auth/libauthdbmail.la"
--
--WARN=0
--if test ! "${authldapheadername-x}" = "x"
--then
--  # --with-auth-ldap was specified
--  AC_MSG_RESULT([using LDAP authentication])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for ldap.h (user supplied)])
--    if test -r "$authldapheadername/ldap.h"
--      then
--      # found
--        AC_MSG_RESULT([$authldapheadername/ldap.h])
--        LDAPINC=$authldapheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        LDAPINC=""
--        authldapheadername=""
--        AC_MSG_ERROR([
--  Unable to find ldap.h where you specified, try just --with-auth-ldap to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for ldap.h])
--    for ldappaths in $ldapheaderpaths
--    do
--      if test -r "$ldappaths/ldap.h"
--      then
--        LDAPINC="$ldappaths"
--        AC_MSG_RESULT([$ldappaths/ldap.h])
--        break
--      fi
--    done
--    if test -z "$LDAPINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate ldap.h, try specifying with --with-ldap])
--    fi
--  fi
--else
--  AC_MSG_RESULT([using SQL authentication])
--fi
--])
--
--dnl DBMAIL_CHECK_LDAP_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
--# Look for libs needed to link to LDAP first
--if test ! "${authldapheadername-x}" = "x"
--then
--  AC_CHECK_LIB(ldap,ldap_bind,[ LDAPLIB="-lldap"], [LDAPLIB=""])
--  if test -z "$LDAPLIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against ldap.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no ldap needed
--  LDAPLIB=""
--fi
--])
--dnl AC_COMPILE_WARNINGS
--dnl set to compile with '-W -Wall'
--AC_DEFUN([AC_COMPILE_WARNINGS],
--[AC_MSG_CHECKING(maximum warning verbosity option)
--if test -n "$CXX"
--then
--  if test "$GXX" = "yes"
--  then
--    ac_compile_warnings_opt='-Wall'
--  fi
--  CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
--fi
--if test -n "$CC"
--then
--  if test "$GCC" = "yes"
--  then
--    ac_compile_warnings_opt='-W -Wall -Wpointer-arith -Wstrict-prototypes'
--  fi
--  CFLAGS="$CFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
--fi
--AC_MSG_RESULT($ac_compile_warnings_msg)
--unset ac_compile_warnings_msg
--unset ac_compile_warnings_opt
--])
--
--# ----------------------------------------------------------------
--# DBMAIL_CHECK_GC
--# I cheated I copied from w3m's acinclude.m4 :)
--# Modified for DBMAIL by Dan Weber
--# ----------------------------------------------------------------
--AC_DEFUN([DBMAIL_CHECK_GC],
--[AC_MSG_CHECKING(for --with-gc)
--AC_ARG_WITH(gc,
-- [  --with-gc[=PREFIX]        libgc PREFIX],
-- [test x"$with_gc" = xno && with_gc="no"],
-- [with_gc="no"])
-- AC_MSG_RESULT($with_gc)
--# Don't check for gc if not appended to command line
-- if test x"$with_gc" = xyes
-- then
-- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
-- unset ac_cv_header_gc_h
-- AC_CHECK_HEADER(gc/gc.h)
-- if test x"$ac_cv_header_gc_h" = xno; then
--   AC_MSG_CHECKING(GC header location)
--   AC_MSG_RESULT($with_gc)
--   gcincludedir=no
--   for dir in $with_gc; do
--     for inc in include include/gc; do
--       cflags="$CFLAGS"
--       CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"
--       AC_MSG_CHECKING($dir/$inc)
--       unset ac_cv_header_gc_h
--       AC_CHECK_HEADER(gc/gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"; break])
--       CFLAGS="$cflags"
--     done
--     if test x"$gcincludedir" != xno; then
--       break;
--     fi
--   done
--   if test x"$gcincludedir" = xno; then
--     AC_MSG_ERROR([gc/gc.h not found])
--   fi
-- else
--  cflags="$CFLAGS -DUSE_GC=1"
--  CFLAGS="$cflags"
-- fi
-- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-- if test x"$ac_cv_lib_gc_GC_init" = xno; then
--    AC_MSG_CHECKING(GC library location)
--    AC_MSG_RESULT($with_gc)
--    gclibdir=no
--    for dir in $with_gc; do
--      ldflags="$LDFLAGS"
--      LDFLAGS="$LDFLAGS -L$dir/lib"
--      AC_MSG_CHECKING($dir)
--      unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
--      LDFLAGS="$ldflags"
--    done
--    if test x"$gclibdir" = xno; then
--      AC_MSG_ERROR([libgc not found])
--    fi
-- fi
--fi])
--
--# getopt.m4 serial 6
--dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# The getopt module assume you want GNU getopt, with getopt_long etc,
--# rather than vanilla POSIX getopt.  This means your your code should
--# always include <getopt.h> for the getopt prototypes.
--
--AC_DEFUN([CHECK_GETOPT_SUBSTITUTE],
--[
--  GETOPT_H=getopt.h
--  AC_LIBOBJ([getopt])
--  AC_LIBOBJ([getopt1])
--  AC_DEFINE([USE_DM_GETOPT], 1,
--    [Define if my_getopt should be used instead of the system's getopt.])
--  USE_DM_GETOPT=1
--  AC_SUBST([USE_DM_GETOPT])
--])
--
--AC_DEFUN([DBMAIL_CHECK_GETOPT],
--[
--  CHECK_PREREQ_GETOPT
--
--  if test -z "$GETOPT_H"; then
--    GETOPT_H=
--    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
--    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
--
--    dnl BSD getopt_long uses an incompatible method to reset option processing,
--    dnl and (as of 2004-10-15) mishandles optional option-arguments.
--    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
--
--    if test -n "$GETOPT_H"; then
--      CHECK_GETOPT_SUBSTITUTE
--    fi
--  fi
--])
--
--# Prerequisites of lib/getopt*.
--AC_DEFUN([CHECK_PREREQ_GETOPT], [:])
--
--#
--# socklen_t
--# from curl
--
--dnl Check for socklen_t: historically on BSD it is an int, and in
--dnl POSIX 1g it is a type of its own, but some platforms use different
--dnl types for the argument to getsockopt, getpeername, etc.  So we
--dnl have to test to find something that will work.
--AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T],
--[
--   AC_CHECK_TYPE([socklen_t], ,[
--      AC_MSG_CHECKING([for socklen_t equivalent])
--      AC_CACHE_VAL([socklen_t_equiv],
--      [
--         # Systems have either "struct sockaddr *" or
--         # "void *" as the second argument to getpeername
--         socklen_t_equiv=
--         for arg2 in "struct sockaddr" void; do
--            for t in int size_t unsigned long "unsigned long"; do
--               AC_TRY_COMPILE([
--                  #include <sys/types.h>
--                  #include <sys/socket.h>
--
--                  int getpeername (int, $arg2 *, $t *);
--               ],[
--                  $t len;
--                  getpeername(0,0,&len);
--               ],[
--                  socklen_t_equiv="$t"
--                  break
--               ])
--            done
--         done
--
--         if test "x$socklen_t_equiv" = x; then
--            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
--         fi
--      ])
--      AC_MSG_RESULT($socklen_t_equiv)
--      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
--                        [type to use in place of socklen_t if not defined])],
--      [#include <sys/types.h>
--#include <sys/socket.h>])
--])
--
--
--# lib-prefix.m4 serial 4 (gettext-0.14.2)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
--dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
--dnl require excessive bracketing.
--ifdef([AC_HELP_STRING],
--[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
--[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
--
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
--
--# lib-link.m4 serial 6 (gettext-0.14.3)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_PREREQ(2.50)
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
--  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
--
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
--
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
--
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  acl_cv_prog_gnu_ld=yes ;;
--*)
--  acl_cv_prog_gnu_ld=no ;;
--esac])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
--
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# Prepare PATH_SEPARATOR.
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break ;;
--      *)
--	test "$with_gnu_ld" != yes && break ;;
--      esac
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
--])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 47 AC_PROG_LIBTOOL
--# Debian $Rev: 214 $
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1527,7 +123,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
- 
- # Same as above, but do not quote variable references.
-@@ -1547,7 +143,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -1595,6 +191,8 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+_LT_CC_BASENAME([$compiler])
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -1640,6 +238,48 @@
- ])# _LT_AC_SYS_COMPILER
- 
- 
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
- # Links a minimal program and checks the executable
-@@ -1712,15 +352,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -1889,7 +529,7 @@
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -1971,7 +611,7 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1981,8 +621,10 @@
-    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-      fi
-    fi
-@@ -2008,11 +650,16 @@
-    LDFLAGS="$LDFLAGS $3"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-      else
-        $2=yes
-      fi
-@@ -2071,11 +718,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -2180,7 +854,7 @@
- }]
- EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) $1 ;;
-@@ -2329,7 +1003,7 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2341,11 +1015,13 @@
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -2409,8 +1085,8 @@
- [AC_MSG_CHECKING([how to hardcode library paths into programs])
- _LT_AC_TAGVAR(hardcode_action, $1)=
- if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2577,7 +1253,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2605,7 +1281,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -2635,7 +1312,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -2658,7 +1335,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -2693,8 +1370,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -2712,7 +1398,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -2739,7 +1425,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -2838,7 +1524,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -2913,7 +1599,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -3079,7 +1769,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  AC_LIBTOOL_LANG_CXX_CONFIG
- 	else
- 	  tagname=""
-@@ -3141,7 +1833,7 @@
- 
- # AC_LIBTOOL_WIN32_DLL
- # --------------------
--# declare package support for building win32 dll's
-+# declare package support for building win32 DLLs
- AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
- [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
- ])# AC_LIBTOOL_WIN32_DLL
-@@ -3315,7 +2007,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -3425,7 +2117,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -3457,7 +2149,7 @@
- AC_DEFUN([AC_PROG_LD_GNU],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -3484,6 +2176,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- ])# AC_PROG_LD_RELOAD_FLAG
- 
- 
-@@ -3517,7 +2218,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3540,13 +2241,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -3562,7 +2263,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3612,12 +2313,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -3738,13 +2437,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl convenience library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-convenience to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!).  If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
- AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case $enable_ltdl_convenience in
-@@ -3763,13 +2462,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl installable library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!).  If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-install to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
- AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -3807,10 +2506,21 @@
- # ---------------
- AC_DEFUN([_LT_AC_LANG_CXX],
- [AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
- ])# _LT_AC_LANG_CXX
- 
-+# _LT_AC_PROG_CXXCPP
-+# ---------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
- 
- # AC_LIBTOOL_F77
- # --------------
-@@ -3883,6 +2593,10 @@
- 
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -3933,7 +2647,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -3946,43 +2660,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
-     ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -4008,7 +2685,7 @@
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_PUSH(C++)
- AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -4037,7 +2714,7 @@
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -4052,6 +2729,10 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -4073,7 +2754,7 @@
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -4180,7 +2861,7 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -4201,6 +2882,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -4246,7 +2930,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -4260,6 +2944,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -4283,65 +2968,76 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
--    ;;
-+        ;;
- 
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4352,14 +3048,14 @@
- 	;;
-     esac
-     ;;
--  freebsd[12]*)
-+  freebsd[[12]]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4376,11 +3072,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
--    aCC)
-+    aCC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -4390,7 +3086,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -4404,7 +3100,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -4420,7 +3116,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4441,12 +3137,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -4467,7 +3163,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -4485,9 +3181,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -4498,7 +3194,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -4511,7 +3207,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4536,17 +3232,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -4577,7 +3297,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4598,9 +3318,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  openbsd*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4616,14 +3352,14 @@
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4641,7 +3377,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4660,7 +3396,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4675,17 +3411,17 @@
- 	# the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4704,7 +3440,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4728,7 +3464,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4740,12 +3476,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4758,36 +3494,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -4795,7 +3528,7 @@
- 	# in the archive.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -4838,7 +3571,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4944,7 +3677,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -5020,6 +3753,21 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+])
-+
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -5070,12 +3818,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-@@ -5085,7 +3837,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -5094,7 +3846,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -5145,20 +3899,27 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- 
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- 
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
- AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
- AC_LIBTOOL_PROG_COMPILER_PIC($1)
- AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -5201,11 +3962,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- 
- AC_LIBTOOL_CONFIG($1)
-@@ -5341,7 +4107,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -5352,11 +4118,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -5387,6 +4153,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -5463,7 +4235,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -5737,9 +4509,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -5761,6 +4530,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDGIRSTW]]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[[BCDEGRST]]'
-   ;;
-@@ -5792,8 +4568,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -5957,7 +4736,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -5982,18 +4761,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6001,22 +4790,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -6031,7 +4820,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -6042,18 +4831,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -6070,7 +4865,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -6081,14 +4876,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -6104,7 +4899,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -6113,13 +4908,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- 	    ;;
-@@ -6129,12 +4924,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6144,7 +4939,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
-@@ -6215,7 +5010,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6241,6 +5036,16 @@
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -6252,7 +5057,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6276,12 +5081,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-       ccc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         # All Alpha code is PIC.
-@@ -6302,9 +5114,14 @@
-       ;;
- 
-     solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -6326,6 +5143,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-     uts4*)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6353,7 +5175,7 @@
-     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -6386,7 +5208,7 @@
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6432,7 +5254,8 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
--
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  _LT_CC_BASENAME([$compiler])
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -6452,6 +5275,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -6502,7 +5346,7 @@
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_AC_TAGVAR(always_export_symbols, $1)=no
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -6516,7 +5360,39 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
-@@ -6551,39 +5427,13 @@
-       fi
-       ;;
- 
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--      fi
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6594,16 +5444,11 @@
-       ;;
-     esac
- 
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
--      runpath_var=LD_RUN_PATH
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--      fi
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -6667,7 +5512,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.[012]|aix4.[012].*)
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -6688,6 +5533,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -6732,7 +5580,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -6746,7 +5594,7 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[[45]]*)
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-@@ -6767,57 +5615,57 @@
-       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      case "$host_os" in
--      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
-+      case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -6851,7 +5699,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6876,7 +5724,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -6885,7 +5733,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -6895,7 +5743,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -6962,6 +5810,7 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-@@ -7007,7 +5856,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -7026,10 +5875,12 @@
-     solaris*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -7038,8 +5889,18 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       case $host_os in
-       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-@@ -7300,7 +6161,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7325,8 +6186,887 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- ])
-+SED=$lt_cv_path_SED
- AC_MSG_RESULT([$SED])
- ])
- 
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
diff --git a/mail/dbmail21/pkg-descr b/mail/dbmail21/pkg-descr
deleted file mode 100644
index 2c03d30b6ea9..000000000000
--- a/mail/dbmail21/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Dbmail is the name of a group of programs that enable the possiblilty of storing
-and retrieving mail messages from a database (currently MySQL or PostgreSQL).
-
-What are the advantages?
-
-    * Scalability.
-      Dbmail is as scalable as the database that is used for the mail storage.
-    * Manageability.
-      Dbmail is based upon a database. Dbmail can be managed by changing
-      settings in the database (f.e. using PHP/Perl/SQL).
-    * Speed.
-      Dbmail uses very efficient, database specific queries for retrieving mail
-      information. This is much faster then parsing a filesystem.
-    * Security.
-      Dbmail has got nothing to do with the filesystem or interaction with other
-      programs in the Unix environment which need special permissions.  Dbmail
-      is as secure as the database it's based upon.
-    * Flexibility.
-      Changes on a Dbmail system (adding of users, changing passwords etc.) are
-      effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail21/pkg-plist b/mail/dbmail21/pkg-plist
deleted file mode 100644
index dc430f4e2413..000000000000
--- a/mail/dbmail21/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-etc/dbmail.conf-dist
-lib/dbmail/libauthdbmail.so.0
-lib/dbmail/libauthdbmail.a
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libauthdbmail.so
-lib/dbmail/libsortdbmail.so.0
-lib/dbmail/libsortdbmail.a
-lib/dbmail/libsortdbmail.la
-lib/dbmail/libsortdbmail.so
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
-%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%lib/dbmail/libmysqldbmail.so.0
-%%MYSQL%%lib/dbmail/libmysqldbmail.a
-%%MYSQL%%lib/dbmail/libmysqldbmail.la
-%%MYSQL%%lib/dbmail/libmysqldbmail.so
-%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so.0
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so
-@dirrm lib/dbmail
-@dirrm %%DATADIR%%/sql
-@dirrm %%DATADIR%%
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
deleted file mode 100644
index cb7adc9d2047..000000000000
--- a/mail/dbmail22/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for:	dbmail
-# Date created:				07/26/2003
-# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbmail
-PORTVERSION=	2.0.7
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.0/
-PKGNAMESUFFIX=	-${DATABASE}
-
-MAINTAINER=	mark_sf@kikg.ifmo.ru
-COMMENT=	An SQL database-based mail system (POP3 and IMAP)
-
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	YES
-USE_OPENSSL=	YES
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
-INSTALLS_SHLIB=	yes
-
-CFLAGS += -fPIC
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=	--with-pgsql
-USE_PGSQL=		yes
-DATABASE=		postgresql
-PLIST_SUB+=		PGSQL=""
-PLIST_SUB+=		MYSQL="@comment "
-LDFLAGS+=		-L${LOCALBASE}/lib/
-.else
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql
-DATABASE=		mysql
-PLIST_SUB+=		MYSQL=""
-PLIST_SUB+=		PGSQL="@comment "
-CFLAGS+=		-I${LOCALBASE}/include/mysql
-LDFLAGS+=		-L${LOCALBASE}/lib/mysql
-.endif
-
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
-PORTDOCS=		INSTALL README EXTRAS
-
-MAN1=			dbmail-smtp.1
-MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
-			dbmail-users.8 dbmail-util.8
-MANCOMPRESSED=		no
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} "   By default dbmail uses MySQL backend database."
-	@${ECHO} "   To build dbmail with PostgreSQL as backend database,"
-	@${ECHO} "	define WITH_POSTGRESQL"
-	@${ECHO} ""
-
-post-patch:
-	${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	${FIND} ${WRKSRC} -name '*.orig' -type f -delete
-
-post-configure:
-	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
-				${WRKSRC}/dbmail.h
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@${MKDIR} ${DATADIR}/sql
-	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
-	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${ECHO} ""
-	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
-	@${ECHO} ""
-	@${ECHO} "	*) Don't forget to update the database using a script from"
-	@${ECHO} "	   ${DATADIR}/sql/"
-	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
-	@${ECHO} "	*) Read the upgrading notes."
-	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
-	@${ECHO} "	*) dbmail can be controled by setting dbmail_imapd_enable,"
-	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
-	@${ECHO} "	   /etc/rc.conf."
-	@${ECHO} ""
-
-.include <bsd.port.mk>
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
deleted file mode 100644
index b2ac397cfd4c..000000000000
--- a/mail/dbmail22/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.0.7.tar.gz) = 11e6eded9e5ec533f6e6ed11fc62a4d8
-SHA256 (dbmail-2.0.7.tar.gz) = ef678002a0f6eed3ae8babc17760e36a76e678852c50d70d8dee1fe693f54026
-SIZE (dbmail-2.0.7.tar.gz) = 584457
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in
deleted file mode 100644
index 82505e96d9b0..000000000000
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-imapd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-imapd: 
-#
-#dbmail_imapd_enable="YES"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_imapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in
deleted file mode 100644
index f1133f43a70e..000000000000
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-lmtpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: 
-#
-#dbmail_lmtpd_enable="YES"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_lmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in
deleted file mode 100644
index d787f6a668e7..000000000000
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-pop3d
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
-#
-#dbmail_pop3d_enable="YES"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=dbmail_pop3d
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/patch-2.0.7_001_266 b/mail/dbmail22/files/patch-2.0.7_001_266
deleted file mode 100644
index b3650d832c24..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_001_266
+++ /dev/null
@@ -1,27 +0,0 @@
---- server.c.orig	Wed Aug 24 13:35:38 2005
-+++ server.c	Tue Sep 13 22:21:59 2005
-@@ -119,7 +119,7 @@
-   
-  	trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop");
-  	while (!GeneralStopRequested) {
--		if (db_connect() != 0) {
-+		if (db_check_connection() != 0) {
- 			
- 			if (! stopped) 
- 				manage_stop_children();
-@@ -128,12 +128,11 @@
- 			sleep(10);
- 			
- 		} else {
--			if (stopped) 
-+			if (stopped) {
-+				manage_restart_children();
- 				stopped=0;
-- 			
--			db_disconnect();
-+			}
- 
--			manage_restart_children();
- 			manage_spare_children();
- 
- 			sleep(1);
diff --git a/mail/dbmail22/files/patch-2.0.7_002 b/mail/dbmail22/files/patch-2.0.7_002
deleted file mode 100644
index 81d8790d3614..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_002
+++ /dev/null
@@ -1,1397 +0,0 @@
---- ChangeLog	(revision 1888)
-+++ ChangeLog	(revision 1889)
-@@ -1,3 +1,17 @@
-+2005-09-27  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
-+	  debian/changelog, server.c:
-+	do not close database connection on startup (closes: #271)
-+
-+2005-09-23  Paul J Stevens <paul@nfg.nl>
-+
-+	* debian/control, debian/patches/00list, 
-+	  debian/patches/04_mailfilter.dpatch:
-+	added mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	fix some compiler warnings in mailfilter patch
-+
- 2005-09-14  Paul J Stevens <paul@nfg.nl>
- 
- 	* debian/control:
---- buildtools/config.guess	(revision 1888)
-+++ buildtools/config.guess	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-08-03'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,13 +17,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -66,11 +68,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -123,7 +125,7 @@
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -196,55 +198,20 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    luna88k:OpenBSD:*:*)
--    	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -297,40 +264,43 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-     *:z/VM:*:*)
- 	echo s390-ibm-zvmoe
--	exit 0 ;;
-+	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -372,10 +342,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +357,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +371,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +428,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +470,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +500,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -544,14 +515,18 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:[45])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-@@ -565,28 +540,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -648,9 +623,19 @@
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -658,11 +643,11 @@
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +675,166 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
- 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
-+	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
--    amd64:CYGWIN*:*:*)
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     crisv32:Linux:*:*)
- 	echo crisv32-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -862,7 +852,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -881,14 +871,17 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +895,7 @@
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +903,25 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +939,15 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
-+		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
-+		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
-+		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -982,15 +975,18 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -998,27 +994,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--	i*86:syllable:*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1026,15 +1022,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1052,73 +1049,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
-+	exit ;;
-     M68*:*:R3V[5678]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1126,65 +1123,65 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo ${UNAME_MACHINE}-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-@@ -1192,7 +1189,7 @@
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1200,25 +1197,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
-+	exit ;;
-     NSE-?:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1229,41 +1226,44 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     *:*VMS:*:*)
-     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
--	    A*) echo alpha-dec-vms && exit 0 ;;
--	    I*) echo ia64-dec-vms && exit 0 ;;
--	    V*) echo vax-dec-vms && exit 0 ;;
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
- 	esac ;;
-     *:XENIX:*:SysV)
- 	echo i386-pc-xenix
--	exit 0 ;;
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1295,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1384,11 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1397,22 +1398,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
---- buildtools/config.sub	(revision 1888)
-+++ buildtools/config.sub	(revision 1889)
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2005-04-22'
-+timestamp='2005-07-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +21,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
- #
-@@ -83,11 +84,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +100,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -247,6 +248,7 @@
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-@@ -255,13 +257,14 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| ms1 \
- 	| msp430 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b \
-@@ -273,6 +276,9 @@
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -321,6 +327,7 @@
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-@@ -329,6 +336,7 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| mmix-* \
-+	| ms1-* \
- 	| msp430-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
-@@ -336,7 +344,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -351,6 +359,8 @@
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -761,9 +771,8 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
- 		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -1089,12 +1098,9 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
-@@ -1181,7 +1187,8 @@
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1199,7 +1206,7 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
-@@ -1388,6 +1395,9 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-@@ -1559,7 +1569,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mail/dbmail22/files/patch-2.0.7_002_271 b/mail/dbmail22/files/patch-2.0.7_002_271
deleted file mode 100644
index 40a21687020a..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_002_271
+++ /dev/null
@@ -1,10 +0,0 @@
---- server.c	(revision 1888)
-+++ server.c	(revision 1889)
-@@ -98,7 +98,6 @@
- 		return -1;
- 	if (db_check_version() != 0)
- 		return -1;
--	db_disconnect();
- 		
- 	ParentPID = getpid();
- 	Restart = 0;
diff --git a/mail/dbmail22/files/patch-2.0.7_003 b/mail/dbmail22/files/patch-2.0.7_003
deleted file mode 100644
index 1b83d01d5dca..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_003
+++ /dev/null
@@ -1,25 +0,0 @@
---- serverchild.c	(revision 1889)
-+++ serverchild.c	(revision 1890)
-@@ -312,19 +312,16 @@
- 
- 		client.timeoutMsg = info->timeoutMsg;
- 		client.timeout = info->timeout;
--		strncpy(client.ip, inet_ntoa(saClient.sin_addr),
--			IPNUM_LEN);
-+		strncpy(client.ip, inet_ntoa(saClient.sin_addr), IPNUM_LEN);
- 		client.clientname[0] = '\0';
- 
- 		if (info->resolveIP) {
--			clientHost =
--			    gethostbyaddr((char *) &saClient.sin_addr,
-+			clientHost = gethostbyaddr((char *) &saClient.sin_addr,
- 					  sizeof(saClient.sin_addr),
- 					  saClient.sin_family);
- 
- 			if (clientHost && clientHost->h_name)
--				strncpy(client.clientname,
--					clientHost->h_name, FIELDSIZE);
-+				strncpy(client.clientname, clientHost->h_name, FIELDSIZE);
- 
- 			trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]",
- 					__FILE__, __func__,
diff --git a/mail/dbmail22/files/patch-2.0.7_003_272 b/mail/dbmail22/files/patch-2.0.7_003_272
deleted file mode 100644
index 0bc97c9d9a2b..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_003_272
+++ /dev/null
@@ -1,22 +0,0 @@
---- sql/mysql/create_tables.mysql	(revision 1889)
-+++ sql/mysql/create_tables.mysql	(revision 1890)
-@@ -118,7 +118,7 @@
- CREATE TABLE dbmail_messageblks (
-    messageblk_idnr bigint(21) NOT NULL auto_increment,
-    physmessage_id bigint(21) DEFAULT '0' NOT NULL,
--   messageblk longtext NOT NULL,
-+   messageblk longblob NOT NULL,
-    blocksize bigint(21) DEFAULT '0' NOT NULL,
-    is_header tinyint(1) DEFAULT '0' NOT NULL,
-    PRIMARY KEY (messageblk_idnr),
---- sql/mysql/create_tables_innoDB.mysql	(revision 1889)
-+++ sql/mysql/create_tables_innoDB.mysql	(revision 1890)
-@@ -148,7 +148,7 @@
- CREATE TABLE dbmail_messageblks (
- 	messageblk_idnr bigint(21) NOT NULL auto_increment,
- 	physmessage_id bigint(21) NOT NULL default '0',
--	messageblk longtext NOT NULL,
-+	messageblk longblob NOT NULL,
- 	blocksize bigint(21) NOT NULL default '0',
- 	is_header tinyint(1) NOT NULL default '0',
- 	PRIMARY KEY (messageblk_idnr),
diff --git a/mail/dbmail22/files/patch-2.0.7_004 b/mail/dbmail22/files/patch-2.0.7_004
deleted file mode 100644
index 8bbd3b8c3f92..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_004
+++ /dev/null
@@ -1,95 +0,0 @@
---- ChangeLog	(revision 1890)
-+++ ChangeLog	(revision 1904)
-@@ -1,3 +1,12 @@
-+2005-10-01  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	added postgres table to mailfilter patch
-+	* debian/changelog, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	change dbmail_messageblks.messageblk from longtext to longblob in mysql
-+	create scripts
-+
- 2005-09-27  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, buildtools/config.guess, buildtools/config.sub, 
---- dsn.c	(revision 1890)
-+++ dsn.c	(revision 1904)
-@@ -309,8 +309,10 @@
- 	 */
- 	else {		/* from: 'if (delivery->useridnr != 0)' */
- 
--		alias_count =
--		    auth_check_user_ext(delivery->address,
-+		if (! strlen(delivery->address))
-+			return 0;
-+		
-+		alias_count = auth_check_user_ext(delivery->address,
- 					delivery->userids,
- 					delivery->forwards, 0);
- 		trace(TRACE_DEBUG,
---- auth/authsql.c	(revision 1890)
-+++ auth/authsql.c	(revision 1904)
-@@ -385,6 +385,9 @@
- 		return 0;
- 	}
- 	
-+	if (strlen(username) < 1)
-+		return 0;
-+
- 	saveres = db_get_result_set();
- 	db_set_result_set(NULL);
- 
---- main.c	(revision 1890)
-+++ main.c	(revision 1904)
-@@ -405,27 +405,25 @@
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
--		trace(TRACE_DEBUG, "main(): scanning for [%s]",
--		      deliver_to_header);
--		if (mail_adr_list(deliver_to_header, &users, &mimelist) !=
--		    0) {
--			trace(TRACE_STOP,
--			      "main(): scanner found no email addresses (scanned for %s)",
-+		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
-+		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
-+			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
- 			      deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
- 
- 		/* Loop through the users list, moving the entries into the dsnusers list. */
--		for (tmp = list_getstart(&users); tmp != NULL;
--		     tmp = tmp->nextnode) {
--			deliver_to_user_t dsnuser;
-+		for (tmp = list_getstart(&users); tmp != NULL; tmp = tmp->nextnode) {
- 
-+			if (! (strlen((char *)tmp->data) > 0))
-+				continue;
-+
-+			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser,
--				     sizeof(deliver_to_user_t));
-+			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
- 		}
- 	}
- 
-@@ -433,11 +431,10 @@
- 	if (deliver_to_mailbox != NULL) {
- 		trace(TRACE_DEBUG, "main(): setting mailbox for all deliveries to [%s]",
- 		      deliver_to_mailbox);
-+		
- 		/* Loop through the dsnusers list, setting the destination mailbox. */
--		for (tmp = list_getstart(&dsnusers); tmp != NULL;
--		     tmp = tmp->nextnode) {
-+		for (tmp = list_getstart(&dsnusers); tmp != NULL; tmp = tmp->nextnode) 
- 			((deliver_to_user_t *)tmp->data)->mailbox = dm_strdup(deliver_to_mailbox);
--		}
- 	}
- 
- 	if (dsnuser_resolve_list(&dsnusers) == -1) {
diff --git a/mail/dbmail22/files/patch-2.0.7_005 b/mail/dbmail22/files/patch-2.0.7_005
deleted file mode 100644
index 573a8e836f0b..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_005
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog	(revision 1904)
-+++ ChangeLog	(revision 1905)
-@@ -1,3 +1,8 @@
-+2005-10-18  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog, auth/authsql.c, dsn.c, main.c:
-+	ignore empty addresses in delivery chain
-+
- 2005-10-01  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, debian/patches/04_mailfilter.dpatch:
diff --git a/mail/dbmail22/files/patch-2.0.7_005_277 b/mail/dbmail22/files/patch-2.0.7_005_277
deleted file mode 100644
index b659de88aac4..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_005_277
+++ /dev/null
@@ -1,38 +0,0 @@
---- imapcommands.c	(revision 1904)
-+++ imapcommands.c	(revision 1905)
-@@ -1787,6 +1787,8 @@
- 	if (args[i + 1]) {
- 		struct tm tm;
- 
-+		memset(&tm, 0, sizeof(struct tm));
-+
- 		if (strptime(args[i], "%d-%b-%Y %T", &tm) != NULL)
- 			strftime(sqldate,
- 				 sizeof(sqldate), "%Y-%m-%d %H:%M:%S",
---- imaputil.c	(revision 1904)
-+++ imaputil.c	(revision 1905)
-@@ -1788,13 +1788,14 @@
- 	time_t ltime;
-         char *last;
- 
-+	memset(&tm_sql_date, 0, sizeof(struct tm));
-+	
-         last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date);
-         if ( (last == NULL) || (*last != '\0') ) {
-                 strcpy(_imapdate, IMAP_STANDARD_DATE);
-                 return _imapdate;
-         }
- 
--	/* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */
- 	ltime = mktime (&tm_sql_date);
- 	tm_imap_date = localtime(&ltime);
- 
-@@ -1814,6 +1815,8 @@
- 	struct tm tm;
- 	char *last_char;
- 
-+	memset(&tm, 0, sizeof(struct tm));
-+
- 	last_char = strptime(imapdate, "%d-%b-%Y", &tm);
- 	if (last_char == NULL || *last_char != '\0') {
- 		trace(TRACE_DEBUG, "%s,%s: error parsing IMAP date %s",
diff --git a/mail/dbmail22/files/patch-2.0.7_006_281 b/mail/dbmail22/files/patch-2.0.7_006_281
deleted file mode 100644
index 40e64bebc054..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_006_281
+++ /dev/null
@@ -1,52 +0,0 @@
---- main.c	(revision 1905)
-+++ main.c	(revision 1948)
-@@ -388,8 +388,8 @@
- 
- 	/* parse the list and scan for field and content */
- 	if (mime_readheader(header, &dummyidx, &mimelist, &dummysize) < 0) {
--		trace(TRACE_ERROR,
--		      "main(): mime_readheader failed to read a header list");
-+		trace(TRACE_ERROR, "%s,%s: mime_readheader failed", 
-+				__FILE__, __func__);
- 		exitcode = EX_TEMPFAIL;
- 		goto freeall;
- 	}
-@@ -400,15 +400,16 @@
- 	if (returnpath.total_nodes == 0)
- 		mail_adr_list("From", &returnpath, &mimelist);
- 	if (returnpath.total_nodes == 0)
--		trace(TRACE_DEBUG, "main(): no return path found.");
-+		trace(TRACE_DEBUG, "%s,%s: no return path found.",
-+				__FILE__,__func__);
- 
- 	/* If the NORMAL delivery mode has been selected... */
- 	if (deliver_to_header != NULL) {
- 		/* parse for destination addresses */
- 		trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header);
- 		if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) {
--			trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)",
--			      deliver_to_header);
-+			trace(TRACE_STOP, "%s,%s: no email addresses found (scanned for %s)",
-+					__FILE__,__func__, deliver_to_header);
- 			exitcode = EX_NOUSER;
- 			goto freeall;
- 		}
-@@ -419,11 +420,16 @@
- 			if (! (strlen((char *)tmp->data) > 0))
- 				continue;
- 
--			deliver_to_user_t dsnuser;
- 			dsnuser_init(&dsnuser);
- 			dsnuser.address = dm_strdup((char *) tmp->data);
- 
--			list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t));
-+			if (! list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t))) {
-+				trace(TRACE_ERROR,"%s,%s: out of memory in list_nodeadd", 
-+						__FILE__, __func__);
-+				exitcode = EX_TEMPFAIL;
-+				goto freeall;
-+			}
-+			
- 		}
- 	}
- 
diff --git a/mail/dbmail22/files/patch-2.0.7_007 b/mail/dbmail22/files/patch-2.0.7_007
deleted file mode 100644
index 6d221a2ef59f..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_007
+++ /dev/null
@@ -1,9108 +0,0 @@
---- Makefile.in	(revision 1905)
-+++ Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,86 +32,209 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- 
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = .
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+bin_PROGRAMS = $(am__EXEEXT_1)
-+sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
-+	dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) \
-+	dbmail-users$(EXEEXT) dbmail-lmtpd$(EXEEXT)
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.in \
-+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-+	THANKS TODO buildtools/config.guess buildtools/config.sub \
-+	buildtools/depcomp buildtools/install-sh buildtools/ltmain.sh \
-+	buildtools/missing buildtools/mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libdbmail_la_DEPENDENCIES =
-+am__libdbmail_la_SOURCES_DIST = config.c debug.c list.c dbmd5.c md5.c \
-+	db.c misc.c mime.c pidfile.c dm_getopt.c server.c \
-+	serverchild.c pool.c header.c pipe.c forward.c dsn.c
-+@USE_DM_GETOPT_TRUE@am__objects_1 = dm_getopt.lo
-+am__objects_2 = config.lo debug.lo list.lo dbmd5.lo md5.lo db.lo \
-+	misc.lo mime.lo pidfile.lo $(am__objects_1)
-+am__objects_3 = server.lo serverchild.lo pool.lo
-+am__objects_4 = header.lo pipe.lo forward.lo dsn.lo
-+am_libdbmail_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-+	$(am__objects_4)
-+libdbmail_la_OBJECTS = $(am_libdbmail_la_OBJECTS)
-+@SIEVE_TRUE@am__EXEEXT_1 = dbmail-sievecmd$(EXEEXT) \
-+@SIEVE_TRUE@	dbmail-timsieved$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+am_dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \
-+	imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
-+	rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) \
-+	dbmsgbuf.$(OBJEXT) acl.$(OBJEXT)
-+dbmail_imapd_OBJECTS = $(am_dbmail_imapd_OBJECTS)
-+dbmail_imapd_DEPENDENCIES = libdbmail.la
-+am_dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
-+dbmail_lmtpd_OBJECTS = $(am_dbmail_lmtpd_OBJECTS)
-+dbmail_lmtpd_DEPENDENCIES = libdbmail.la
-+am_dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT)
-+dbmail_pop3d_OBJECTS = $(am_dbmail_pop3d_OBJECTS)
-+dbmail_pop3d_DEPENDENCIES = libdbmail.la
-+am__dbmail_sievecmd_SOURCES_DIST = sievecmd.c
-+@SIEVE_TRUE@am_dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT)
-+dbmail_sievecmd_OBJECTS = $(am_dbmail_sievecmd_OBJECTS)
-+@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la
-+am_dbmail_smtp_OBJECTS = main.$(OBJEXT)
-+dbmail_smtp_OBJECTS = $(am_dbmail_smtp_OBJECTS)
-+dbmail_smtp_DEPENDENCIES = libdbmail.la
-+am__dbmail_timsieved_SOURCES_DIST = timsieve.c timsieved.c
-+@SIEVE_TRUE@am_dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \
-+@SIEVE_TRUE@	timsieved.$(OBJEXT)
-+dbmail_timsieved_OBJECTS = $(am_dbmail_timsieved_OBJECTS)
-+@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la
-+am_dbmail_users_OBJECTS = user.$(OBJEXT)
-+dbmail_users_OBJECTS = $(am_dbmail_users_OBJECTS)
-+dbmail_users_DEPENDENCIES = libdbmail.la
-+am_dbmail_util_OBJECTS = maintenance.$(OBJEXT)
-+dbmail_util_OBJECTS = $(am_dbmail_util_OBJECTS)
-+dbmail_util_DEPENDENCIES = libdbmail.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdbmail_la_SOURCES) $(dbmail_imapd_SOURCES) \
-+	$(dbmail_lmtpd_SOURCES) $(dbmail_pop3d_SOURCES) \
-+	$(dbmail_sievecmd_SOURCES) $(dbmail_smtp_SOURCES) \
-+	$(dbmail_timsieved_SOURCES) $(dbmail_users_SOURCES) \
-+	$(dbmail_util_SOURCES)
-+DIST_SOURCES = $(am__libdbmail_la_SOURCES_DIST) \
-+	$(dbmail_imapd_SOURCES) $(dbmail_lmtpd_SOURCES) \
-+	$(dbmail_pop3d_SOURCES) $(am__dbmail_sievecmd_SOURCES_DIST) \
-+	$(dbmail_smtp_SOURCES) $(am__dbmail_timsieved_SOURCES_DIST) \
-+	$(dbmail_users_SOURCES) $(dbmail_util_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,343 +242,318 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- SUBDIRS = mysql pgsql auth sort man
--
- @SIEVE_TRUE@SIEVEPROGS = dbmail-sievecmd dbmail-timsieved
--
- @USE_DM_GETOPT_TRUE@DM_GETOPT = dm_getopt.c
--
--bin_PROGRAMS = $(SIEVEPROGS)
--sbin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-util dbmail-users dbmail-lmtpd 
--
- COMMON = config.c debug.c list.c dbmd5.c md5.c db.c misc.c mime.c pidfile.c $(DM_GETOPT)
- SERVER = server.c serverchild.c pool.c
- DELIVER = header.c pipe.c forward.c dsn.c
- 
- # CFLAGS
- AM_CFLAGS = -fomit-frame-pointer
--
- dbmail_smtp_SOURCES = main.c
--dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@
--
-+dbmail_smtp_LDADD = libdbmail.la
- dbmail_pop3d_SOURCES = pop3.c pop3d.c
--dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_pop3d_LDADD = libdbmail.la
- dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c
--dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ 
--
-+dbmail_imapd_LDADD = libdbmail.la
- dbmail_util_SOURCES = maintenance.c
--dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_util_LDADD = libdbmail.la
- dbmail_users_SOURCES = user.c
--dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_users_LDADD = libdbmail.la
- dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
--dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+dbmail_lmtpd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_sievecmd_SOURCES = sievecmd.c 
--@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
-+@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la
- @SIEVE_TRUE@dbmail_timsieved_SOURCES = timsieve.c timsieved.c
--@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--
--lib_LTLIBRARIES = libdbmail.la
-+@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la
-+noinst_LTLIBRARIES = libdbmail.la
- libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER)
--libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(lib_LTLIBRARIES)
-+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libdbmail_la_LDFLAGS = 
--libdbmail_la_DEPENDENCIES = 
--@USE_DM_GETOPT_FALSE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_FALSE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_FALSE@server.lo serverchild.lo pool.lo header.lo pipe.lo \
--@USE_DM_GETOPT_FALSE@forward.lo dsn.lo
--@USE_DM_GETOPT_TRUE@libdbmail_la_OBJECTS =  config.lo debug.lo list.lo \
--@USE_DM_GETOPT_TRUE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \
--@USE_DM_GETOPT_TRUE@dm_getopt.lo server.lo serverchild.lo pool.lo \
--@USE_DM_GETOPT_TRUE@header.lo pipe.lo forward.lo dsn.lo
--@SIEVE_FALSE@bin_PROGRAMS = 
--@SIEVE_TRUE@bin_PROGRAMS =  dbmail-sievecmd$(EXEEXT) \
--@SIEVE_TRUE@dbmail-timsieved$(EXEEXT)
--sbin_PROGRAMS =  dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \
--dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) dbmail-users$(EXEEXT) \
--dbmail-lmtpd$(EXEEXT)
--PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
--
--@SIEVE_TRUE@dbmail_sievecmd_OBJECTS =  sievecmd.$(OBJEXT)
--@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES =  libdbmail.la
--dbmail_sievecmd_LDFLAGS = 
--@SIEVE_TRUE@dbmail_timsieved_OBJECTS =  timsieve.$(OBJEXT) \
--@SIEVE_TRUE@timsieved.$(OBJEXT)
--@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES =  libdbmail.la
--dbmail_timsieved_LDFLAGS = 
--dbmail_smtp_OBJECTS =  main.$(OBJEXT)
--dbmail_smtp_DEPENDENCIES =  libdbmail.la
--dbmail_smtp_LDFLAGS = 
--dbmail_pop3d_OBJECTS =  pop3.$(OBJEXT) pop3d.$(OBJEXT)
--dbmail_pop3d_DEPENDENCIES =  libdbmail.la
--dbmail_pop3d_LDFLAGS = 
--dbmail_imapd_OBJECTS =  quota.$(OBJEXT) imap4.$(OBJEXT) \
--imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \
--rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) dbmsgbuf.$(OBJEXT) \
--acl.$(OBJEXT)
--dbmail_imapd_DEPENDENCIES =  libdbmail.la
--dbmail_imapd_LDFLAGS = 
--dbmail_util_OBJECTS =  maintenance.$(OBJEXT)
--dbmail_util_DEPENDENCIES =  libdbmail.la
--dbmail_util_LDFLAGS = 
--dbmail_users_OBJECTS =  user.$(OBJEXT)
--dbmail_users_DEPENDENCIES =  libdbmail.la
--dbmail_users_LDFLAGS = 
--dbmail_lmtpd_OBJECTS =  lmtp.$(OBJEXT) lmtpd.$(OBJEXT)
--dbmail_lmtpd_DEPENDENCIES =  libdbmail.la
--dbmail_lmtpd_LDFLAGS = 
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
--Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \
--config.in configure configure.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/acl.P .deps/config.P .deps/db.P .deps/dbmd5.P \
--.deps/dbmsgbuf.P .deps/dbsearch.P .deps/debug.P .deps/dm_getopt.P \
--.deps/dsn.P .deps/forward.P .deps/header.P .deps/imap4.P \
--.deps/imapcommands.P .deps/imapd.P .deps/imaputil.P .deps/list.P \
--.deps/lmtp.P .deps/lmtpd.P .deps/main.P .deps/maintenance.P .deps/md5.P \
--.deps/memblock.P .deps/mime.P .deps/misc.P .deps/pidfile.P .deps/pipe.P \
--.deps/pool.P .deps/pop3.P .deps/pop3d.P .deps/quota.P .deps/rfcmsg.P \
--.deps/server.P .deps/serverchild.P .deps/sievecmd.P .deps/timsieve.P \
--.deps/timsieved.P .deps/user.P
--SOURCES = $(libdbmail_la_SOURCES) $(dbmail_sievecmd_SOURCES) $(dbmail_timsieved_SOURCES) $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_util_SOURCES) $(dbmail_users_SOURCES) $(dbmail_lmtpd_SOURCES)
--OBJECTS = $(libdbmail_la_OBJECTS) $(dbmail_sievecmd_OBJECTS) $(dbmail_timsieved_OBJECTS) $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_util_OBJECTS) $(dbmail_users_OBJECTS) $(dbmail_lmtpd_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-+.SUFFIXES: .c .lo .o .obj
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
- 
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
--config.h: stamp-h
-+config.h: stamp-h1
- 	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) stamp-h1; \
- 	else :; fi
--stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+
-+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+	rm -f stamp-h1
-+	touch $@
- 
--mostlyclean-hdr:
--
--clean-hdr:
--
- distclean-hdr:
--	-rm -f config.h
-+	-rm -f config.h stamp-h1
- 
--maintainer-clean-hdr:
--
--mostlyclean-libLTLIBRARIES:
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--
--distclean-libLTLIBRARIES:
--
--maintainer-clean-libLTLIBRARIES:
--
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
--	  else :; fi; \
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
- 	done
--
--uninstall-libLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--	done
--
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
--
--mostlyclean-compile:
--	-rm -f *.o core *.core
--	-rm -f *.$(OBJEXT)
--
--clean-compile:
--
--distclean-compile:
--	-rm -f *.tab.c
--
--maintainer-clean-compile:
--
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
--mostlyclean-libtool:
--	-rm -f *.lo
--
--clean-libtool:
--	-rm -rf .libs _libs
--
--distclean-libtool:
--
--maintainer-clean-libtool:
--
--libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
--
--mostlyclean-binPROGRAMS:
--
--clean-binPROGRAMS:
--	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--
--distclean-binPROGRAMS:
--
--maintainer-clean-binPROGRAMS:
--
-+libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) 
-+	$(LINK)  $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
- 
--mostlyclean-sbinPROGRAMS:
--
--clean-sbinPROGRAMS:
--	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
--
--distclean-sbinPROGRAMS:
--
--maintainer-clean-sbinPROGRAMS:
--
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-sbinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(sbin_PROGRAMS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
- 	done
- 
--dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES)
-+clean-sbinPROGRAMS:
-+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) 
-+	@rm -f dbmail-imapd$(EXEEXT)
-+	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) 
-+	@rm -f dbmail-lmtpd$(EXEEXT)
-+	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) 
-+	@rm -f dbmail-pop3d$(EXEEXT)
-+	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) 
- 	@rm -f dbmail-sievecmd$(EXEEXT)
- 	$(LINK) $(dbmail_sievecmd_LDFLAGS) $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_LDADD) $(LIBS)
--
--dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES)
-+dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) 
-+	@rm -f dbmail-smtp$(EXEEXT)
-+	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) 
- 	@rm -f dbmail-timsieved$(EXEEXT)
- 	$(LINK) $(dbmail_timsieved_LDFLAGS) $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_LDADD) $(LIBS)
-+dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) 
-+	@rm -f dbmail-users$(EXEEXT)
-+	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) 
-+	@rm -f dbmail-util$(EXEEXT)
-+	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
- 
--dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES)
--	@rm -f dbmail-smtp$(EXEEXT)
--	$(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS)
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
- 
--dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES)
--	@rm -f dbmail-pop3d$(EXEEXT)
--	$(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS)
-+distclean-compile:
-+	-rm -f *.tab.c
- 
--dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES)
--	@rm -f dbmail-imapd$(EXEEXT)
--	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmd5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmsgbuf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsearch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dm_getopt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsn.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap4.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapcommands.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaputil.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtpd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maintenance.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblock.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3d.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfcmsg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverchild.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievecmd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieve.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieved.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
- 
--dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES)
--	@rm -f dbmail-util$(EXEEXT)
--	$(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS)
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES)
--	@rm -f dbmail-users$(EXEEXT)
--	$(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS)
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES)
--	@rm -f dbmail-lmtpd$(EXEEXT)
--	$(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS)
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
--
--@SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -463,7 +565,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -471,13 +573,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -487,246 +600,327 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.in $$unique $(LISP))
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
- 
--mostlyclean-tags:
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
--clean-tags:
--
- distclean-tags:
--	-rm -f TAGS ID
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
--maintainer-clean-tags:
--
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
--
--# This target untars the dist file and tries a VPATH configuration.  Then
--# it guarantees that the distribution is self-contained by making another
--# tarfile.
--distcheck: dist
--	-rm -rf $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
--	dc_install_base=`cd $(distdir)/=inst && pwd`; \
--	cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
--	  && $(MAKE) $(AM_MAKEFLAGS) check \
--	  && $(MAKE) $(AM_MAKEFLAGS) install \
--	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist
--	-rm -rf $(distdir)
--	@banner="$(distdir).tar.gz is ready for distribution"; \
--	dashes=`echo "$$banner" | sed s/./=/g`; \
--	echo "$$dashes"; \
--	echo "$$banner"; \
--	echo "$$dashes"
--dist: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
--dist-all: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
- distdir: $(DISTFILES)
--	-rm -rf $(distdir)
-+	$(am__remove_distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	$(mkdir_p) $(distdir)/buildtools
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--	for subdir in $(SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
- 
---include $(DEP_FILES)
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
- 
--mostlyclean-depend:
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
- 
--clean-depend:
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
- 
--distclean-depend:
--	-rm -rf .deps
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
- 
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-recursive
--dvi-am:
--dvi: dvi-recursive
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--installcheck-am:
--installcheck: installcheck-recursive
--all-recursive-am: config.h
--	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
--		install-sbinPROGRAMS
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
--
--install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
--		uninstall-sbinPROGRAMS
--uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
--all-redirect: all-recursive-am
-+
-+installcheck: installcheck-recursive
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
--		$(DESTDIR)$(sbindir)
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
--		mostlyclean-compile mostlyclean-libtool \
--		mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
--		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
- 
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am
- 
--clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
--		clean-depend clean-generic mostlyclean-am
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-hdr distclean-libtool distclean-tags
- 
--clean: clean-recursive
-+dvi: dvi-recursive
- 
--distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-binPROGRAMS \
--		distclean-sbinPROGRAMS distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-recursive
--	-rm -f config.status
-+html: html-recursive
- 
--maintainer-clean-am:  maintainer-clean-hdr \
--		maintainer-clean-libLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-binPROGRAMS \
--		maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
--		maintainer-clean-depend maintainer-clean-generic \
--		distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
- 
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-recursive
--	-rm -f config.status
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
--clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
--uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
--distclean-compile clean-compile maintainer-clean-compile \
--mostlyclean-libtool distclean-libtool clean-libtool \
--maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
--clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
--install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
--clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
--install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
--install-exec-recursive uninstall-exec-recursive installdirs-recursive \
--uninstalldirs-recursive all-recursive check-recursive \
--installcheck-recursive info-recursive dvi-recursive \
--mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck all-recursive-am install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-recursive
- 
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
- 
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-sbinPROGRAMS
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-+	clean-noinstLTLIBRARIES clean-recursive clean-sbinPROGRAMS \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-compile distclean-generic distclean-hdr \
-+	distclean-libtool distclean-recursive distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-sbinPROGRAMS \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am uninstall-sbinPROGRAMS
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- man/Makefile.in	(revision 1905)
-+++ man/Makefile.in	(revision 1948)
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+@SET_MAKE@
-+
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -26,88 +30,116 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = man
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-+man8dir = $(mandir)/man8
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -115,41 +147,105 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 \
-+	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
- 
--man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 	dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8	
-+all: all-am
- 
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--man1dir = $(mandir)/man1
--man8dir = $(mandir)/man8
--MANS = $(man_MANS)
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  man/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
- 
--NROFF = nroff
--DIST_COMMON =  Makefile.am Makefile.in
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+mostlyclean-libtool:
-+	-rm -f *.lo
- 
--TAR = tar
--GZIP_ENV = --best
--all: all-redirect
--.SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
-+clean-libtool:
-+	-rm -rf .libs _libs
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--install-man1:
--	$(mkinstalldirs) $(DESTDIR)$(man1dir)
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-man1: $(man1_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -158,31 +254,43 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
- uninstall-man1:
--	@list='$(man1_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--
--install-man8:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir)
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+install-man8: $(man8_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
-@@ -191,120 +299,161 @@
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--
- uninstall-man8:
--	@list='$(man8_MANS)'; \
--	l2='$(man_MANS)'; for i in $$l2; do \
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
- 	  case "$$i" in \
- 	    *.8*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--install-man: $(MANS)
--	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man8
--uninstall-man:
--	@$(NORMAL_UNINSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man8
- tags: TAGS
- TAGS:
- 
-+ctags: CTAGS
-+CTAGS:
- 
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
--subdir = man
--
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
-+all-am: Makefile $(MANS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am: install-man
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-man
--uninstall: uninstall-am
--all-am: Makefile $(MANS)
--all-redirect: all-am
-+
-+installcheck: installcheck-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man8
--
--
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool mostlyclean-am
- 
--clean-am:  clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
- 
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man: install-man1 install-man8
-+
-+installcheck-am:
-+
- maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
- 
--.PHONY: install-man1 uninstall-man1 install-man8 uninstall-man8 \
--install-man uninstall-man tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+mostlyclean: mostlyclean-am
- 
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-man
-+
-+uninstall-man: uninstall-man1 uninstall-man8
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-man8 install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-man uninstall-man1 uninstall-man8
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- configure.in	(revision 1905)
-+++ configure.in	(revision 1948)
-@@ -19,7 +19,6 @@
- AC_INIT(main.c)
- AC_CONFIG_AUX_DIR(buildtools)
- AM_CONFIG_HEADER(config.h:config.in)
--DBMAIL_MSG_CONFIGURE_START
- AM_INIT_AUTOMAKE(dbmail, 2.0.7)
- AM_MAINTAINER_MODE
- 
---- ChangeLog	(revision 1905)
-+++ ChangeLog	(revision 1948)
-@@ -1,3 +1,46 @@
-+2005-12-22  Paul J Stevens <paul@nfg.nl>
-+
-+	* ChangeLog:
-+	blah
-+	* imapcommands.c, imaputil.c:
-+	resync git tree
-+	* ChangeLog:
-+	Merge with /home/paul/git/dbmail-2.0
-+commit d97cef746efa52603fc423759bfe216b53859321
-+tree 32074d5cac257cf2b30ed48979ca88050441e4c7
-+parent 8c598295ff66c378785b2187f6923c99b5df2a6f
-+author Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+committer Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200
-+	* ChangeLog:
-+	blah
-+	* ChangeLog, debian/patches/04_mailfilter.dpatch:
-+	update mailfilter dpatch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/patches/04_mailfilter.dpatch:
-+	update mailfilter patch
-+	* debian/po/es.po:
-+	adding spanish translation of debconf files
-+	* INSTALL, INSTALL.dbmail, Makefile.in, acinclude.m4, aclocal.m4, 
-+	  auth/Makefile.in, buildtools/install-sh, buildtools/ltmain.sh, 
-+	  buildtools/missing, buildtools/mkinstalldirs, configure, 
-+	  configure.in, debian/control, debian/rules, man/Makefile.in, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	cleanup autotools chain a bit
-+	* main.c:
-+	remove redeclaration of global dsnuser (closes: #281)
-+	* INSTALL, Makefile.in, auth/Makefile.in, buildtools/depcomp, debian/rules, 
-+	  mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in:
-+	updated autotools for autoconf-1.9
-+
-+2005-10-26  Paul J Stevens <paul@nfg.nl>
-+
-+	* dsn.c, main.c, server.c, serverchild.c, sql/mysql/create_tables.mysql, 
-+	  sql/mysql/create_tables_innoDB.mysql:
-+	resync tree
-+	* imapcommands.c, imaputil.c:
-+	initialize struct tm values before calling strptime (closes: #277)
-+
- 2005-10-18  Paul J Stevens <paul@nfg.nl>
- 
- 	* ChangeLog, auth/authsql.c, dsn.c, main.c:
---- buildtools/depcomp	(revision 0)
-+++ buildtools/depcomp	(revision 1948)
-@@ -0,0 +1,530 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-
---- buildtools/missing	(revision 1905)
-+++ buildtools/missing	(revision 1948)
-@@ -1,8 +1,12 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
--# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
- 
-+scriptversion=2005-06-08.21
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
-@@ -15,15 +19,47 @@
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- 
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
- if test $# -eq 0; then
-   echo 1>&2 "Try \`$0 --help' for more information"
-   exit 1
- fi
- 
-+run=:
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
- case "$1" in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -35,6 +71,7 @@
- Options:
-   -h, --help      display this help and exit
-   -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
- 
- Supported PROGRAM values:
-   aclocal      touch file \`aclocal.m4'
-@@ -43,13 +80,19 @@
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-   lex          create \`lex.yy.c', if possible, from existing .c
-   makeinfo     touch the output file
--  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
-     ;;
- 
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--    echo "missing - GNU libit 0.0"
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -58,10 +101,45 @@
-     exit 1
-     ;;
- 
--  aclocal)
-+esac
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+  lex|yacc)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+  aclocal*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-          to install the \`Automake' and \`Perl' packages.  Grab them from
-          any GNU archive site."
-     touch aclocal.m4
-@@ -69,8 +147,8 @@
- 
-   autoconf)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`configure.in'.  You might want to install the
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-          archive site."
-     touch configure
-@@ -78,11 +156,11 @@
- 
-   autoheader)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`acconfig.h' or \`configure.in'.  You might want
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-          from any GNU archive site."
--    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
-@@ -95,10 +173,10 @@
-     touch $touch_files
-     ;;
- 
--  automake)
-+  automake*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
--         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-          You might want to install the \`Automake' and \`Perl' packages.
-          Grab them from any GNU archive site."
-     find . -type f -name Makefile.am -print |
-@@ -106,9 +184,32 @@
- 	   while read f; do touch "$f"; done
-     ;;
- 
-+  autom4te)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-   bison|yacc)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-@@ -138,7 +239,7 @@
- 
-   lex|flex)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-@@ -159,28 +260,90 @@
-     fi
-     ;;
- 
-+  help2man)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+    fi
-+    if [ -f "$file" ]; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit 1
-+    fi
-+    ;;
-+
-   makeinfo)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-          indirectly affecting the aspect of the manual.  The spurious
-          call might also be the consequence of using a buggy \`make' (AIX,
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-     if test -z "$file"; then
--      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
-+  tar)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case "$firstarg" in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case "$firstarg" in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-   *)
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-@@ -188,3 +351,10 @@
- esac
- 
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/install-sh	(revision 1905)
-+++ buildtools/install-sh	(revision 1948)
-@@ -1,20 +1,39 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-05-14.22
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# Copyright (C) 1994 X Consortium
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
- #
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
- # when there is no Makefile.
-@@ -23,13 +42,11 @@
- # from scratch.  It can only install one file at a time, a restriction
- # shared with many OS's install programs.
- 
--
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
- 
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
- 
- mvprog="${MVPROG-mv}"
-@@ -41,211 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
- 
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd="$cpprog"
--	    shift
--	    continue;;
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--	-d) dir_arg=true
--	    shift
--	    continue;;
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
- 
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
- 
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
- 
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
- 
--	-s) stripcmd="$stripprog"
--	    shift
--	    continue;;
-+    -d) dir_arg=true
-+        shift
-+        continue;;
- 
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
-+    --help) echo "$usage"; exit $?;;
- 
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$src" = x ]
--then
--	echo "install:	no input file specified"
--	exit 1
--else
--	true
--fi
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
- 
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--	
--	if [ -d $dst ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=mkdir
--	fi
--else
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad 
--# if $src (and thus $dsttmp) contains '*'.
-+    -t) dstarg=$2
-+	shift
-+	shift
-+	continue;;
- 
--	if [ -f $src -o -d $src ]
--	then
--		true
--	else
--		echo "install:  $src does not exist"
--		exit 1
--	fi
--	
--	if [ x"$dst" = x ]
--	then
--		echo "install:	no destination specified"
--		exit 1
--	else
--		true
--	fi
-+    -T) no_target_directory=true
-+	shift
-+	continue;;
- 
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	if [ -d $dst ]
--	then
--		dst="$dst"/`basename $src`
--	else
--		true
--	fi
-+    *)  # When -d is used, all remaining arguments are directories to create.
-+	# When -t is used, the destination is already specified.
-+	test -n "$dir_arg$dstarg" && break
-+        # Otherwise, the last argument is the destination.  Remove it from $@.
-+	for arg
-+	do
-+          if test -n "$dstarg"; then
-+	    # $@ is not empty: it contains at least $arg.
-+	    set fnord "$@" "$dstarg"
-+	    shift # fnord
-+	  fi
-+	  shift # arg
-+	  dstarg=$arg
-+	done
-+	break;;
-+  esac
-+done
-+
-+if test -z "$1"; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
- fi
- 
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src ;;
-+  esac
- 
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    src=
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='	
--'
--IFS="${IFS-${defaultIFS}}"
-+    if test -d "$dst"; then
-+      mkdircmd=:
-+      chmodcmd=
-+    else
-+      mkdircmd=$mkdirprog
-+    fi
-+  else
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
- 
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+    if test -z "$dstarg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
- 
--pathcomp=''
-+    dst=$dstarg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst ;;
-+    esac
- 
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
--	shift
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dstarg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dst=$dst/`basename "$src"`
-+    fi
-+  fi
- 
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
-+  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- 
--	pathcomp="${pathcomp}/"
--done
--fi
-+  # Make sure that the destination directory exists.
- 
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
-+  # Skip lots of stat calls in the usual case.
-+  if test ! -d "$dstdir"; then
-+    defaultIFS='
-+	 '
-+    IFS="${IFS-$defaultIFS}"
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
-+    oIFS=$IFS
-+    # Some sh's can't handle IFS=/ for some reason.
-+    IFS='%'
-+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+    shift
-+    IFS=$oIFS
- 
--# If we're going to rename the final executable, determine the name now.
-+    pathcomp=
- 
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
-+    while test $# -ne 0 ; do
-+      pathcomp=$pathcomp$1
-+      shift
-+      if test ! -d "$pathcomp"; then
-+        $mkdirprog "$pathcomp"
-+	# mkdir can fail with a `File exist' error in case several
-+	# install-sh are creating the directory concurrently.  This
-+	# is OK.
-+	test -d "$pathcomp" || exit
-+      fi
-+      pathcomp=$pathcomp/
-+    done
-+  fi
- 
--# don't allow the sed command to completely eliminate the filename
-+  if test -n "$dir_arg"; then
-+    $doit $mkdircmd "$dst" \
-+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
- 
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
-+  else
-+    dstfile=`basename "$dst"`
- 
--# Make a temp file name in the proper directory.
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
- 
--	dsttmp=$dstdir/#inst.$$#
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+    trap '(exit $?); exit' 1 2 13 15
- 
--# Move or copy the file name to the temp name
-+    # Copy the file name to the temp name.
-+    $doit $cpprog "$src" "$dsttmp" &&
- 
--	$doit $instcmd $src $dsttmp &&
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+    # Now rename the file to the real destination.
-+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+      || {
-+	   # The rename failed, perhaps because mv can't rename something else
-+	   # to itself, or perhaps because mv is so ancient that it does not
-+	   # support -f.
- 
--# and set any options; do chmod last to preserve setuid bits
-+	   # Now remove or move aside any old file at destination location.
-+	   # We try this two ways since rm can't unlink itself on some
-+	   # systems and the destination file might be busy for other
-+	   # reasons.  In this case, the final cleanup might fail but the new
-+	   # file should still install successfully.
-+	   {
-+	     if test -f "$dstdir/$dstfile"; then
-+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+	       || {
-+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		 (exit 1); exit 1
-+	       }
-+	     else
-+	       :
-+	     fi
-+	   } &&
- 
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
-+	   # Now rename the file to the real destination.
-+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	 }
-+    }
-+  fi || { (exit 1); exit 1; }
-+done
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+  (exit 0); exit 0
-+}
- 
--# Now rename the file to the real destination.
--
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
--
--fi &&
--
--
--exit 0
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- configure	(revision 1905)
-+++ configure	(revision 1948)
-@@ -278,15 +278,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -463,7 +463,7 @@
- # 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
-+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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1023,8 +1023,10 @@
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-shared[=PKGS]
-                           build shared libraries [default=yes]
-   --enable-static[=PKGS]
-@@ -1526,22 +1528,9 @@
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
--
-           ac_config_headers="$ac_config_headers config.h:config.in"
- 
--          ac_config_commands="$ac_config_commands default-1"
--
--echo "$as_me:$LINENO: result:
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&5
--echo "${ECHO_T}
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--" >&6
--
-+am__api_version="1.9"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -1625,20 +1614,21 @@
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
--echo timestamp > conftestfile
-+echo timestamp > conftest.file
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
--   if test "$*" != "X $srcdir/configure conftestfile" \
--      && test "$*" != "X conftestfile $srcdir/configure"; then
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-       # If neither matched, then we have a broken ls.  This can happen
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-@@ -1651,7 +1641,7 @@
-    { (exit 1); exit 1; }; }
-    fi
- 
--   test "$2" = conftestfile
-+   test "$2" = conftest.file
-    )
- then
-    # Ok.
-@@ -1663,7 +1653,6 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-@@ -1679,6 +1668,92 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$AWK" && break
-+done
-+
- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-@@ -1708,17 +1783,38 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
- 
--PACKAGE=dbmail
--
--VERSION=2.0.7
--
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=dbmail
-+ VERSION=2.0.7
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
- _ACEOF
-@@ -1728,85 +1824,124 @@
- #define VERSION "$VERSION"
- _ACEOF
- 
-+# Some tools Automake needs.
- 
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
- 
--missing_dir=`cd $ac_aux_dir && pwd`
--echo "$as_me:$LINENO: checking for working aclocal" >&5
--echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
- fi
--
--echo "$as_me:$LINENO: checking for working autoconf" >&5
--echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working automake" >&5
--echo $ECHO_N "checking for working automake... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   AUTOMAKE="$missing_dir/missing automake"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
--
--echo "$as_me:$LINENO: checking for working autoheader" >&5
--echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
- else
--   AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:$LINENO: checking for working makeinfo" >&5
--echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
--   MAKEINFO=makeinfo
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+  STRIP=$ac_ct_STRIP
- else
--   MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
-+  STRIP="$ac_cv_prog_STRIP"
- fi
- 
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
- 
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
- echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-@@ -1827,6 +1962,7 @@
-   MAINTAINER_MODE_TRUE='#'
-   MAINTAINER_MODE_FALSE=
- fi
-+
-   MAINT=$MAINTAINER_MODE_TRUE
- 
- 
-@@ -2109,6 +2245,71 @@
- echo "${ECHO_T}using SQL authentication" >&6
- fi
- 
-+DEPDIR="${am__leading_dot}deps"
-+
-+          ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+  enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3033,7 +3234,116 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
- 
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
-@@ -5472,6 +5782,115 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CC"   am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
- echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6
- if test -n "$CXX"
-@@ -5684,6 +6103,7 @@
- fi
- 
- 
-+
- if test -n "$MYSQLINC"; then
-   MYSQL_TRUE=
-   MYSQL_FALSE='#'
-@@ -5693,6 +6113,7 @@
- fi
- 
- 
-+
- if test -n "$PGSQLINC"; then
-   PGSQL_TRUE=
-   PGSQL_FALSE='#'
-@@ -5702,6 +6123,7 @@
- fi
- 
- 
-+
- if test -n "$SIEVEINC"; then
-   SIEVE_TRUE=
-   SIEVE_FALSE='#'
-@@ -5711,6 +6133,7 @@
- fi
- 
- 
-+
- if test -n "$LDAPINC"; then
-   LDAP_TRUE=
-   LDAP_FALSE='#'
-@@ -5718,6 +6141,7 @@
-   LDAP_TRUE='#'
-   LDAP_FALSE=
- fi
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-@@ -6409,7 +6833,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6434,10 +6858,10 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- 
- fi
- 
-+SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -6499,7 +6923,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -6533,7 +6957,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -6563,6 +6987,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- 
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -6649,7 +7082,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -6672,13 +7105,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -6694,7 +7127,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -6744,12 +7177,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -6841,7 +7272,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6844 "configure"' > conftest.$ac_ext
-+  echo '#line 7275 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6884,7 +7315,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -7502,7 +7933,121 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--ac_ext=cc
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7732,7 +8277,9 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+fi
- 
-+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7825,7 +8372,7 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:7828:" \
-+echo "$as_me:8375:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8013,11 +8560,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -8063,9 +8637,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -8087,6 +8658,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDGIRSTW]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
-@@ -8118,8 +8696,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -8281,7 +8862,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
-@@ -8301,7 +8882,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8586,6 +9167,17 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -8611,7 +9203,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8673,7 +9265,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8772,6 +9364,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8808,11 +9414,16 @@
-    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works=yes
-+       fi
-      else
-        lt_prog_compiler_static_works=yes
-      fi
-@@ -8854,18 +9465,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8860: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8864: \$? = $ac_status" >&5
-+   echo "$as_me:9475: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -8942,7 +9555,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -8968,6 +9581,16 @@
- 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic='-qnocommon'
-+         lt_prog_compiler_wl='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -8979,7 +9602,7 @@
-       lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9003,12 +9626,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-@@ -9029,9 +9659,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -9053,6 +9688,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic='-pic'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9087,18 +9727,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9097: \$? = $ac_status" >&5
-+   echo "$as_me:9737: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works=yes
-      fi
-    fi
-@@ -9119,7 +9761,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic=
-@@ -9147,23 +9789,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9153: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9795: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9157: \$? = $ac_status" >&5
-+   echo "$as_me:9799: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -9239,6 +9883,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -9259,6 +9913,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -9309,7 +9984,7 @@
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -9327,6 +10002,38 @@
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -9365,32 +10072,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds="$tmp_archive_cmds"
--      fi
--      link_all_deplibs=no
--    else
--      ld_shlibs=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -9401,16 +10082,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9474,7 +10150,7 @@
-       link_all_deplibs=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9495,6 +10171,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9639,7 +10318,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec=' '
- 	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -9653,7 +10332,7 @@
-       ld_shlibs=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
-@@ -9679,52 +10358,52 @@
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
-+      whole_archive_flag_spec=''
-       link_all_deplibs=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -9758,7 +10437,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -9783,7 +10462,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -9792,7 +10471,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -9802,7 +10481,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9869,6 +10548,7 @@
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec='${wl}-E'
-       else
-@@ -9914,7 +10594,7 @@
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9933,10 +10613,12 @@
-     solaris*)
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -9945,8 +10627,18 @@
-       hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs=yes
-       ;;
-@@ -10220,7 +10912,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10248,7 +10940,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -10278,7 +10971,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -10301,7 +10994,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10336,8 +11029,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10355,7 +11057,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -10382,7 +11084,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -10481,7 +11183,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -10556,7 +11258,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -10678,8 +11384,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
-+   test -n "$runpath_var" || \
-+   test "X$hardcode_automatic" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct" != no &&
-@@ -11338,7 +12044,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11341 "configure"
-+#line 12047 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11404,7 +12110,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11436,7 +12142,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11439 "configure"
-+#line 12145 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11502,7 +12208,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11552,7 +12258,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -11565,43 +12271,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
-     ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11731,7 +12400,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -11742,11 +12411,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -11776,7 +12445,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -11852,7 +12527,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -12147,7 +12822,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12184,7 +12861,7 @@
- compiler_lib_search_path_CXX=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -12205,6 +12882,20 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -12226,8 +12917,17 @@
- CC=${CXX-"c++"}
- compiler=$CC
- compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
-@@ -12297,7 +12997,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -12331,7 +13031,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -12440,7 +13140,7 @@
-     link_all_deplibs_CXX=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.012|aix4.012.*)
-+      case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12461,6 +13161,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -12606,7 +13309,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	whole_archive_flag_spec_CXX=' '
- 	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -12620,6 +13323,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -12643,65 +13347,76 @@
-       ld_shlibs_CXX=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_CXX='-undefined dynamic_lookup'
--            ;;
--        esac
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        ;;
- 
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--  else
--    ld_shlibs_CXX=no
--  fi
--    ;;
--
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -12712,14 +13427,14 @@
- 	;;
-     esac
-     ;;
--  freebsd12*)
-+  freebsd[12]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -12736,11 +13451,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
--    aCC)
-+    aCC*)
-       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -12750,7 +13465,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -12764,7 +13479,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12780,7 +13495,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       hardcode_direct_CXX=no
-       hardcode_shlibpath_var_CXX=no
-@@ -12801,12 +13516,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -12827,7 +13542,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -12845,9 +13560,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12858,7 +13573,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -12871,7 +13586,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12896,17 +13611,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -12937,7 +13676,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -12958,9 +13697,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    ld_shlibs_CXX=no
-+    ;;
-+  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -12976,14 +13731,14 @@
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13001,7 +13756,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13020,7 +13775,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -13035,17 +13790,17 @@
- 	# the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13064,7 +13819,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13088,7 +13843,7 @@
-   sco*)
-     archive_cmds_need_lc_CXX=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13100,12 +13855,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13118,36 +13873,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        archive_cmds_need_lc_CXX=yes
- 	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
- 	case $host_os in
--	  solaris2.0-5 | solaris2.0-5.*) ;;
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	link_all_deplibs_CXX=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13155,7 +13907,7 @@
- 	# in the archive.
- 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -13198,7 +13950,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13251,7 +14003,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -13327,6 +14079,20 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+
-+
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13382,7 +14148,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -13407,18 +14173,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13426,22 +14202,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      lt_prog_compiler_pic_CXX='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -13456,7 +14232,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -13467,18 +14243,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13495,7 +14277,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    lt_prog_compiler_pic_CXX='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -13506,14 +14288,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13529,7 +14311,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  *)
-@@ -13538,13 +14320,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    lt_prog_compiler_wl_CXX='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-PIC'
- 	    ;;
-@@ -13554,12 +14336,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13569,7 +14351,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
-@@ -13610,18 +14392,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:13620: \$? = $ac_status" >&5
-+   echo "$as_me:14402: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-@@ -13642,7 +14426,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_CXX=
-@@ -13670,23 +14454,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:13680: \$? = $ac_status" >&5
-+   echo "$as_me:14464: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -13741,7 +14527,7 @@
-     export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     link_all_deplibs_CXX=no
-@@ -13924,7 +14710,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13952,7 +14738,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -13982,7 +14769,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -14005,7 +14792,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14040,8 +14827,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14059,7 +14855,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -14086,7 +14882,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -14185,7 +14981,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -14260,7 +15056,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -14382,8 +15182,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_CXX" != no &&
-@@ -15042,7 +15842,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15045 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15108,7 +15908,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15140,7 +15940,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15143 "configure"
-+#line 15943 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15206,7 +16006,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15358,7 +16158,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -15434,7 +16240,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -15715,13 +16521,36 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -15733,7 +16562,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -15742,7 +16571,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15819,7 +16650,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15845,6 +16676,16 @@
- 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_F77='-qnocommon'
-+         lt_prog_compiler_wl_F77='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -15856,7 +16697,7 @@
-       lt_prog_compiler_wl_F77='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -15880,12 +16721,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_F77='-Wl,'
-+	lt_prog_compiler_pic_F77='-fpic'
-+	lt_prog_compiler_static_F77='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-@@ -15906,9 +16754,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_F77='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_F77='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -15930,6 +16783,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -15964,18 +16822,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15970: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15974: \$? = $ac_status" >&5
-+   echo "$as_me:16832: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-@@ -15996,7 +16856,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_F77=
-@@ -16024,23 +16884,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16034: \$? = $ac_status" >&5
-+   echo "$as_me:16894: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_F77=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -16116,6 +16978,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -16136,6 +17008,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_F77=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -16186,7 +17079,7 @@
-       allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=no
-       enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -16200,10 +17093,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_F77=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_F77=no
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16242,32 +17167,6 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_F77="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_F77="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_F77=no
--    else
--      ld_shlibs_F77=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16278,16 +17177,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
-+    if test "$ld_shlibs_F77" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_F77=
-+      export_dynamic_flag_spec_F77=
-+      whole_archive_flag_spec_F77=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16351,7 +17245,7 @@
-       link_all_deplibs_F77=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16372,6 +17266,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -16496,7 +17393,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_F77=' '
- 	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -16510,7 +17407,7 @@
-       ld_shlibs_F77=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
- 
-@@ -16531,57 +17428,57 @@
-       old_archive_From_new_cmds_F77='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_F77=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_F77='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
-+      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_F77=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_F77=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -16615,7 +17512,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -16640,7 +17537,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -16649,7 +17546,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -16659,7 +17556,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16726,6 +17623,7 @@
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_F77='${wl}-E'
-       else
-@@ -16771,7 +17669,7 @@
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16790,10 +17688,12 @@
-     solaris*)
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16802,8 +17702,18 @@
-       hardcode_shlibpath_var_F77=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_F77=yes
-       ;;
-@@ -17077,7 +17987,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17105,7 +18015,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -17135,7 +18046,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17158,7 +18069,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17193,8 +18104,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17212,7 +18132,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -17239,7 +18159,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -17338,7 +18258,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -17413,7 +18333,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -17535,8 +18459,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
-+   test -n "$runpath_var_F77" || \
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_F77" != no &&
-@@ -17713,7 +18637,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -17789,7 +18719,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -18027,7 +18957,7 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
-@@ -18038,16 +18968,42 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- compiler_GCJ=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-+
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- archive_cmds_need_lc_GCJ=no
- 
-+old_archive_cmds_GCJ=$old_archive_cmds
- 
-+
- lt_prog_compiler_no_builtin_flag_GCJ=
- 
- if test "$GCC" = yes; then
-@@ -18069,18 +19025,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18075: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19031: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18079: \$? = $ac_status" >&5
-+   echo "$as_me:19035: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -18157,7 +19115,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18183,6 +19141,16 @@
- 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18194,7 +19162,7 @@
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18218,12 +19186,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-fpic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-@@ -18244,9 +19219,14 @@
-       ;;
- 
-     solaris*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_GCJ='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -18268,6 +19248,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_GCJ='-pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18302,18 +19287,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19293: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18312: \$? = $ac_status" >&5
-+   echo "$as_me:19297: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-@@ -18334,7 +19321,7 @@
- fi
- 
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_GCJ=
-@@ -18362,23 +19349,25 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18368: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19355: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18372: \$? = $ac_status" >&5
-+   echo "$as_me:19359: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_GCJ=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&5
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -18454,6 +19443,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -18474,6 +19473,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -18524,7 +19544,7 @@
-       allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=no
-       enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -18538,10 +19558,42 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_GCJ=no
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-     netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18580,32 +19632,6 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
- 
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_GCJ="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
--      fi
--      link_all_deplibs_GCJ=no
--    else
--      ld_shlibs_GCJ=no
--    fi
--    ;;
--
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18616,16 +19642,11 @@
-       ;;
-     esac
- 
--    if test "$ld_shlibs_GCJ" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--      fi
-+    if test "$ld_shlibs_GCJ" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_GCJ=
-+      export_dynamic_flag_spec_GCJ=
-+      whole_archive_flag_spec_GCJ=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18689,7 +19710,7 @@
-       link_all_deplibs_GCJ=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18710,6 +19731,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -18854,7 +19878,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  whole_archive_flag_spec_GCJ=' '
- 	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -18868,7 +19892,7 @@
-       ld_shlibs_GCJ=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
- 
-@@ -18889,57 +19913,57 @@
-       old_archive_From_new_cmds_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_GCJ=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-       archive_cmds_need_lc_GCJ=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_GCJ=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_GCJ=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -18973,7 +19997,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -18998,7 +20022,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -19007,7 +20031,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -19017,7 +20041,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19084,6 +20108,7 @@
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-@@ -19129,7 +20154,7 @@
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19148,10 +20173,12 @@
-     solaris*)
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19160,8 +20187,18 @@
-       hardcode_shlibpath_var_GCJ=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_GCJ=yes
-       ;;
-@@ -19435,7 +20472,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19463,7 +20500,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -19493,7 +20531,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -19516,7 +20554,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19551,8 +20589,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19570,7 +20617,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -19597,7 +20644,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -19696,7 +20743,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -19771,7 +20818,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -19893,8 +20944,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var GCJ" || \
--   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-+   test -n "$runpath_var_GCJ" || \
-+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_GCJ" != no &&
-@@ -20553,7 +21604,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20556 "configure"
-+#line 21607 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20619,7 +21670,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20651,7 +21702,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20654 "configure"
-+#line 21705 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20717,7 +21768,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20869,7 +21920,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -20945,7 +22002,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21193,11 +22250,35 @@
- compiler=$CC
- 
- 
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- compiler_RC=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
- lt_cv_prog_compiler_c_o_RC=yes
- 
- # The else clause should only fire when bootstrapping the
-@@ -21314,7 +22395,13 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
- 
-@@ -21390,7 +22477,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -21758,6 +22845,76 @@
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${USE_DM_GETOPT_TRUE}" && test -z "${USE_DM_GETOPT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_DM_GETOPT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${MYSQL_TRUE}" && test -z "${MYSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MYSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${PGSQL_TRUE}" && test -z "${PGSQL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"PGSQL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${SIEVE_TRUE}" && test -z "${SIEVE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"SIEVE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"LDAP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -22191,8 +23348,8 @@
- # INIT-COMMANDS section.
- #
- 
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--
- _ACEOF
- 
- 
-@@ -22208,7 +23365,7 @@
-   "auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES auth/Makefile" ;;
-   "sort/Makefile" ) CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;;
-   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -22298,6 +23455,7 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -22305,7 +23463,17 @@
- s,@AUTOMAKE@,$AUTOMAKE,;t t
- s,@AUTOHEADER@,$AUTOHEADER,;t t
- s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@mkdir_p@,$mkdir_p,;t t
-+s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@am__tar@,$am__tar,;t t
-+s,@am__untar@,$am__untar,;t t
- s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
- s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
- s,@MAINT@,$MAINT,;t t
-@@ -22318,6 +23486,15 @@
- s,@ac_ct_CC@,$ac_ct_CC,;t t
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
-@@ -22359,11 +23536,12 @@
- s,@ac_ct_AR@,$ac_ct_AR,;t t
- s,@RANLIB@,$RANLIB,;t t
- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
- s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@F77@,$F77,;t t
- s,@FFLAGS@,$FFLAGS,;t t
-@@ -22830,7 +24008,29 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
- done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
-+	 X$ac_file : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- 
-@@ -22946,7 +24146,91 @@
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
- echo "$as_me: executing $ac_dest commands" >&6;}
-   case $ac_dest in
--    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
-+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    { if $as_mkdir_p; then
-+    mkdir -p $dirpart/$fdir
-+  else
-+    as_dir=$dirpart/$fdir
-+    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 $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
-   esac
- done
- _ACEOF
---- INSTALL.dbmail	(revision 0)
-+++ INSTALL.dbmail	(revision 1948)
-@@ -0,0 +1,210 @@
-+/* $Id: INSTALL 1606 2005-02-23 15:46:03Z paul $ 
-+   (c) 2000-2002 IC&S, The Netherlands */
-+
-+DBMAIL installation
-+===================
-+
-+This file describes the installation of DBMail. To read about extra 
-+features in dbmail you should consult the EXTRAS file.
-+Remember, DBmail is easy to install, as long as you exactly follow
-+these instructions.
-+
-+What do you need?
-+
-+- a working mysql (> 4.0.14) or postgresql installation
-+- a working smtp server (Postfix, Exim, QMail or Sendmail)
-+- the DBMail source (www.dbmail.org)
-+- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
-+  *BSD systems, make sure you install and use 'gmake'. 
-+- development files (libs, scripts and include files) for your database
-+  server. These will probably be provided by separate packages.
-+    
-+
-+1.	Setup a database
-+
-+	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
-+	MySQL is supported from version 4.0.14 upwards. Earlier versions of
-+	MySQL lack some SQL features that are needed for DBMail, like support
-+	for the INSERT...SELECT statement.
-+
-+	Mysql setup
-+	-----------
-+
-+	Note: Since some DBMail tables can get VERY large (depending on your
-+	mailusage) we advise using InnoDB as database storage backend.
-+	
-+	First you'll need to create the DBMail database in MYSQL. You can
-+	do this by issueing the following command. This step is only
-+	necessary when you do not have a database for DBMail yet. Note that
-+	you will be prompted for the MySQL root password.
-+
-+	mysqladmin create dbmail -u root -p
-+
-+	This creates a database with the name "dbmail". Now you have to give
-+	a non-root user access to this database. Start the MySQL command-line
-+	client as root:
-+
-+	mysql -u root -p 
-+
-+	and enter the following command:
-+
-+	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+
-+	Where <pass> should be replaced with the password you want for
-+	the dbmail user. After this step, the database is ready to be
-+	used by the dbmail user. The next step is the creation of the
-+	database tables used by DBMail. Log out of the MySQL client and run 
-+	the following command from the command line. You will have to
-+	enter the password you set in the previous step.
-+
-+	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+
-+	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
-+	create_tables.mysql. This is not recommended though. In future
-+	versions, DBMail will only support MySQL with transaction support,
-+	which is only given by InnoDB at the moment.
-+	
-+	After this, the DBMAIL tables will have been created and we can go
-+	on to the compilation and installation of DBMail itself.
-+
-+	Postgresql setup
-+	----------------
-+	
-+	First you need to create the postgresql user dbmail is going to use.
-+	This is done by. Note that this command can only be performed by
-+	user postgres or another PostgreSQL user with the privileges to
-+	create users and and databases.
-+
-+	createuser -U postgres dbmail
-+
-+	Off course you can use an other username than dbmail, simply replace
-+	it. You can set a password for the user by doing a:
-+
-+	ALTER USER dbmail WITH PASSWORD '<password>';
-+
-+	In a postgresql console, with <password> replaced by the actual 
-+	password you want to use. After doing this you should create the
-+	database for dbmail:
-+
-+	createdb -U dbmail dbmail
-+
-+	The first dbmail is the user you just created, the second the name of
-+	the database.  Of course you can use an other databasename. After
-+	setting up the user and database it's time to create the tables, do a:
-+
-+	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+
-+	Don't forget to start postgresql with the -i option, so it accepts
-+	TCP/IP connections.
-+
-+2. 	Set the database settings
-+
-+	Copy the dbmail.conf file to /etc
-+	Edit the dbmail.conf file and set everything in there
-+	to your likeings.
-+
-+	Make sure to set your database name, user and host are configured
-+	in dbmail.conf. Other options in the configuration file are 
-+	documented there.
-+
-+3.	Run configure & make
-+	Run the configure script. This script uses pg_config or mysql_config
-+	(depending on --with-mysql or --with-pgsql) to detect where the
-+	libraries and include files for these databases are.
-+
-+	e.g. when working with PostgreSQL, this is the configure command:
-+
-+	./configure --with-pgsql
-+
-+	After running configure, 'make all' will build the executables.
-+	
-+	Running 'make install' will install the executables in /usr/local/sbin
-+
-+4.	Create users in the dbmail system
-+
-+	Next you will need to create some users into the dbmail mailing sytem.
-+	Currently this can be done in two ways. One way is using the
-+	dbmail-users utility. The other way is doing it in the database
-+	itself. To do it using the dbmail-users utility and do the following:
-+
-+	dbmail-users -a <username> -w <password> -g <clientid>\
-+	             -m <maxmail> [-s aliases]
-+	
-+	clientid can be left 0 (this is if you want certain mailadministrators
-+	administer specific groups of mailusers). maxmail is the maximum
-+	number of bytes this user may have in his/her mailboxes. 0 is
-+	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
-+	number of aliases for this user. @domain are domain aliases. 
-+	A user always needs to have at least one alias to receive mail, unless
-+	the users username is something like foo@bar.org, where bar.org is 
-+	a domain the mailserver deliveres to.
-+	
-+	example: 
-+	./dbmail-users -a john -w secret -g 0 -m 25M\
-+	               -s john@dude.org john@dude.net @net.com
-+	
-+	This will create a user john, with a password secret. It will set
-+	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
-+	and @net.com will be sent to john. The @net.com is a fallback alias.
-+	This means that all mail that cannot be delivered to an existing alias
-+	for a @net.com address will sent to john.
-+
-+5.	Configure your MTA 
-+
-+	There are two ways to connect your MTA to DBMail. The MTA can start a
-+	dbmail-smtp process and pipe SMTP commands and messages to it, or it
-+	can use lmtp (Local Mail Transport Protocol) to deliver via
-+	dbmail-lmtpd. LMTP is the preferred solution because it offers more
-+	robust error handling and because it is a daemon, high traffic servers
-+	will have reduced delays which would be incurred starting up a
-+	dbmail-smtp process for each message.
-+
-+	The specifics of delivering to DBMail from your MTA can be found in
-+	the INSTALL.<MTA Name> files. Currently there is documentation for
-+	Postfix and Exim.
-+
-+	If you use a different kind of mta that we do not have documentation
-+	for: The dbmail injector program, dbmail-smtp, can receive information
-+	in two ways. Either through raw mail (for example, delivered by
-+	procmail) using the -n option or from a MTA with recipients in the
-+	commandline using the -d option. Be carefull, the -n option is not
-+	fully tested and may behave unexected. If possible use the -d option.
-+
-+	Setup for LMTP should be straightforward if your MTA supports it.
-+
-+6.	Setting up the maintenance run
-+
-+	The dbmail daemons and the smtp injector itself will never actually
-+	delete mail from the database. The only program that will do this is
-+	the dbmail-util program. This program will also check the
-+	integrity of the dbmail database and, if nescessary, fix it. The
-+	dbmail-util program will first delete all messages that are set
-+	for final deletion. After that it will set all messages that have the
-+	delete status set to status final deletion. This way dbmail always
-+	has a backup based upon the interval difference between maintenance
-+	jobs. We recommend running the dbmail-util program in a daily
-+	interval from cron:
-+
-+	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
-+	
-+7.	Starting the servers
-+
-+	If you want users to be able to retrieve email via IMAP or POP3, run
-+	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
-+	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+
-+8.	Problems
-+	--------
-+	For problems you can subscribe to the dbmail mailinglist: 
-+	http://mailman.fastxs.nl/mailman/listinfo/dbmail
-+	
-+	Please always check the archives first.
-+
-+	or check out the dbmail website at http://www.dbmail.org.
-+
-+	Please note that DBMail logs a lot of relevant data to the maillog
-+	(often located at /var/log/maillog or /var/log/mail.log). This can
-+	help you often if something is not working, e.g. if there's no
-+	connection to the database.  
-+
-+
---- INSTALL	(revision 1905)
-+++ INSTALL	(revision 1948)
-@@ -1,210 +1,236 @@
--/* $Id$ 
--   (c) 2000-2002 IC&S, The Netherlands */
-+Installation Instructions
-+*************************
- 
--DBMAIL installation
--===================
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-+Software Foundation, Inc.
- 
--This file describes the installation of DBMail. To read about extra 
--features in dbmail you should consult the EXTRAS file.
--Remember, DBmail is easy to install, as long as you exactly follow
--these instructions.
-+This file is free documentation; the Free Software Foundation gives
-+unlimited permission to copy, distribute and modify it.
- 
--What do you need?
-+Basic Installation
-+==================
- 
--- a working mysql (> 4.0.14) or postgresql installation
--- a working smtp server (Postfix, Exim, QMail or Sendmail)
--- the DBMail source (www.dbmail.org)
--- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On
--  *BSD systems, make sure you install and use 'gmake'. 
--- development files (libs, scripts and include files) for your database
--  server. These will probably be provided by separate packages.
--    
-+These are generic installation instructions.
- 
--1.	Setup a database
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
- 
--	Currently,  DBMail supports both MySQL and PostgreSQL for mailstorage.
--	MySQL is supported from version 4.0.14 upwards. Earlier versions of
--	MySQL lack some SQL features that are needed for DBMail, like support
--	for the INSERT...SELECT statement.
-+   It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring.  (Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.)
- 
--	Mysql setup
--	-----------
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
- 
--	Note: Since some DBMail tables can get VERY large (depending on your
--	mailusage) we advise using InnoDB as database storage backend.
--	
--	First you'll need to create the DBMail database in MYSQL. You can
--	do this by issueing the following command. This step is only
--	necessary when you do not have a database for DBMail yet. Note that
--	you will be prompted for the MySQL root password.
-+   The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'.  You only need
-+`configure.ac' if you want to change it or regenerate `configure' using
-+a newer version of `autoconf'.
- 
--	mysqladmin create dbmail -u root -p
-+The simplest way to compile this package is:
- 
--	This creates a database with the name "dbmail". Now you have to give
--	a non-root user access to this database. Start the MySQL command-line
--	client as root:
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
- 
--	mysql -u root -p 
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
- 
--	and enter the following command:
-+  2. Type `make' to compile the package.
- 
--	GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>'
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
- 
--	Where <pass> should be replaced with the password you want for
--	the dbmail user. After this step, the database is ready to be
--	used by the dbmail user. The next step is the creation of the
--	database tables used by DBMail. Log out of the MySQL client and run 
--	the following command from the command line. You will have to
--	enter the password you set in the previous step.
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
- 
--	mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
- 
--	If you cannot use InnoDB, replace creates_table_innoDB.mysql by
--	create_tables.mysql. This is not recommended though. In future
--	versions, DBMail will only support MySQL with transaction support,
--	which is only given by InnoDB at the moment.
--	
--	After this, the DBMAIL tables will have been created and we can go
--	on to the compilation and installation of DBMail itself.
-+Compilers and Options
-+=====================
- 
--	Postgresql setup
--	----------------
--	
--	First you need to create the postgresql user dbmail is going to use.
--	This is done by. Note that this command can only be performed by
--	user postgres or another PostgreSQL user with the privileges to
--	create users and and databases.
-+Some systems require unusual options for compilation or linking that the
-+`configure' script does not know about.  Run `./configure --help' for
-+details on some of the pertinent environment variables.
- 
--	createuser -U postgres dbmail
-+   You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment.  Here
-+is an example:
- 
--	Off course you can use an other username than dbmail, simply replace
--	it. You can set a password for the user by doing a:
-+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
- 
--	ALTER USER dbmail WITH PASSWORD '<password>';
-+   *Note Defining Variables::, for more details.
- 
--	In a postgresql console, with <password> replaced by the actual 
--	password you want to use. After doing this you should create the
--	database for dbmail:
-+Compiling For Multiple Architectures
-+====================================
- 
--	createdb -U dbmail dbmail
-+You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
- 
--	The first dbmail is the user you just created, the second the name of
--	the database.  Of course you can use an other databasename. After
--	setting up the user and database it's time to create the tables, do a:
-+   If you have to use a `make' that does not support the `VPATH'
-+variable, you have to compile the package for one architecture at a
-+time in the source code directory.  After you have installed the
-+package for one architecture, use `make distclean' before reconfiguring
-+for another architecture.
- 
--	psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql
-+Installation Names
-+==================
- 
--	Don't forget to start postgresql with the -i option, so it accepts
--	TCP/IP connections.
-+By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
- 
--2. 	Set the database settings
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
- 
--	Copy the dbmail.conf file to /etc
--	Edit the dbmail.conf file and set everything in there
--	to your likeings.
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
- 
--	Make sure to set your database name, user and host are configured
--	in dbmail.conf. Other options in the configuration file are 
--	documented there.
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
- 
--3.	Run configure & make
--	Run the configure script. This script uses pg_config or mysql_config
--	(depending on --with-mysql or --with-pgsql) to detect where the
--	libraries and include files for these databases are.
-+Optional Features
-+=================
- 
--	e.g. when working with PostgreSQL, this is the configure command:
-+Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
- 
--	./configure --with-pgsql
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
- 
--	After running configure, 'make all' will build the executables.
--	
--	Running 'make install' will install the executables in /usr/local/sbin
-+Specifying the System Type
-+==========================
- 
--4.	Create users in the dbmail system
-+There may be some features `configure' cannot figure out automatically,
-+but needs to determine by the type of machine the package will run on.
-+Usually, assuming the package is built to be run on the _same_
-+architectures, `configure' can figure that out, but if it prints a
-+message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
- 
--	Next you will need to create some users into the dbmail mailing sytem.
--	Currently this can be done in two ways. One way is using the
--	dbmail-users utility. The other way is doing it in the database
--	itself. To do it using the dbmail-users utility and do the following:
-+     CPU-COMPANY-SYSTEM
- 
--	dbmail-users -a <username> -w <password> -g <clientid>\
--	             -m <maxmail> [-s aliases]
--	
--	clientid can be left 0 (this is if you want certain mailadministrators
--	administer specific groups of mailusers). maxmail is the maximum
--	number of bytes this user may have in his/her mailboxes. 0 is
--	unlimited. Add K or M for kilobytes and megabytes. Aliases are a 
--	number of aliases for this user. @domain are domain aliases. 
--	A user always needs to have at least one alias to receive mail, unless
--	the users username is something like foo@bar.org, where bar.org is 
--	a domain the mailserver deliveres to.
--	
--	example: 
--	./dbmail-users -a john -w secret -g 0 -m 25M\
--	               -s john@dude.org john@dude.net @net.com
--	
--	This will create a user john, with a password secret. It will set
--	john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net
--	and @net.com will be sent to john. The @net.com is a fallback alias.
--	This means that all mail that cannot be delivered to an existing alias
--	for a @net.com address will sent to john.
-+where SYSTEM can have one of these forms:
- 
--5.	Configure your MTA 
-+     OS KERNEL-OS
- 
--	There are two ways to connect your MTA to DBMail. The MTA can start a
--	dbmail-smtp process and pipe SMTP commands and messages to it, or it
--	can use lmtp (Local Mail Transport Protocol) to deliver via
--	dbmail-lmtpd. LMTP is the preferred solution because it offers more
--	robust error handling and because it is a daemon, high traffic servers
--	will have reduced delays which would be incurred starting up a
--	dbmail-smtp process for each message.
-+   See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
- 
--	The specifics of delivering to DBMail from your MTA can be found in
--	the INSTALL.<MTA Name> files. Currently there is documentation for
--	Postfix and Exim.
-+   If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
- 
--	If you use a different kind of mta that we do not have documentation
--	for: The dbmail injector program, dbmail-smtp, can receive information
--	in two ways. Either through raw mail (for example, delivered by
--	procmail) using the -n option or from a MTA with recipients in the
--	commandline using the -d option. Be carefull, the -n option is not
--	fully tested and may behave unexected. If possible use the -d option.
-+   If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
- 
--	Setup for LMTP should be straightforward if your MTA supports it.
-+Sharing Defaults
-+================
- 
--6.	Setting up the maintenance run
-+If you want to set default values for `configure' scripts to share, you
-+can create a site shell script called `config.site' that gives default
-+values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
- 
--	The dbmail daemons and the smtp injector itself will never actually
--	delete mail from the database. The only program that will do this is
--	the dbmail-util program. This program will also check the
--	integrity of the dbmail database and, if nescessary, fix it. The
--	dbmail-util program will first delete all messages that are set
--	for final deletion. After that it will set all messages that have the
--	delete status set to status final deletion. This way dbmail always
--	has a backup based upon the interval difference between maintenance
--	jobs. We recommend running the dbmail-util program in a daily
--	interval from cron:
-+Defining Variables
-+==================
- 
--	0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq
--	
--7.	Starting the servers
-+Variables not defined in a site shell script can be set in the
-+environment passed to `configure'.  However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost.  In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'.  For example:
- 
--	If you want users to be able to retrieve email via IMAP or POP3, run
--	dbmail-imapd and/or dbmail-pop3d. If you are delivering email via
--	LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!).
-+     ./configure CC=/usr/local2/bin/gcc
- 
--8.	Problems
--	--------
--	For problems you can subscribe to the dbmail mailinglist: 
--	http://mailman.fastxs.nl/mailman/listinfo/dbmail
--	
--	Please always check the archives first.
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).  Here is a another example:
- 
--	or check out the dbmail website at http://www.dbmail.org.
-+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
- 
--	Please note that DBMail logs a lot of relevant data to the maillog
--	(often located at /var/log/maillog or /var/log/mail.log). This can
--	help you often if something is not working, e.g. if there's no
--	connection to the database.  
-+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-+configuration-related scripts to be executed by `/bin/bash'.
- 
-+`configure' Invocation
-+======================
- 
-+`configure' recognizes the following options to control how it operates.
-+
-+`--help'
-+`-h'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--version'
-+`-V'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`--cache-file=FILE'
-+     Enable the cache: use and save the results of the tests in FILE,
-+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-+     disable caching.
-+
-+`--config-cache'
-+`-C'
-+     Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`configure' also accepts some other, not widely useful, options.  Run
-+`configure --help' for more details.
-+
---- acinclude.m4	(revision 1905)
-+++ acinclude.m4	(revision 1948)
-@@ -4,138 +4,9 @@
- 
- # serial 1
- 
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
- dnl DBMAIL_BOTH_SQL_CHECK
- dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
-+AC_DEFUN([DBMAIL_BOTH_SQL_CHECK], [dnl
- AC_ARG_WITH(mysql,
-             [  --with-mysql            use MySQL as database. Uses mysql_config
- 	       		  for finding includes and libraries],
-@@ -187,7 +58,7 @@
- 
- dnl DBMAIL_CHECK_SQL_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SQL_LIBS], [dnl
- #Look for include files and libs needed to link
- #use the configuration utilities (mysql_config and pg_config for this)
- # MySQL first
-@@ -231,7 +102,7 @@
- ])
- dnl DBMAIL_SIEVE_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
-+AC_DEFUN([DBMAIL_SIEVE_CONF], [dnl
- AC_MSG_RESULT([checking for sorting configuration])
- AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
- 	sieveheadername="$withval$")
-@@ -287,7 +158,7 @@
- 
- dnl DBMAIL_CHECK_SIEVE_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_SIEVE_LIBS], [dnl
- # Look for libs needed to link to SIEVE first
- if test ! "${sieveheadername-x}" = "x"
- then
-@@ -307,7 +178,7 @@
- 	
- dnl DBMAIL_AUTH_CONF
- dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
-+AC_DEFUN([DBMAIL_AUTH_CONF], [dnl
- AC_MSG_RESULT([checking for authentication configuration])
- AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
- 	authldapheadername="$withval$")
-@@ -363,7 +234,7 @@
- 
- dnl DBMAIL_CHECK_LDAP_LIBS
- dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
-+AC_DEFUN([DBMAIL_CHECK_LDAP_LIBS], [dnl
- # Look for libs needed to link to LDAP first
- if test ! "${authldapheadername-x}" = "x"
- then
diff --git a/mail/dbmail22/files/patch-2.0.7_008 b/mail/dbmail22/files/patch-2.0.7_008
deleted file mode 100644
index ca3e9b671145..000000000000
--- a/mail/dbmail22/files/patch-2.0.7_008
+++ /dev/null
@@ -1,8766 +0,0 @@
---- pgsql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ pgsql/Makefile.in	Mon Dec 26 09:42:29 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,105 +12,140 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
--# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
--#
--# This program is free software; you can redistribute it and/or 
--# modify it under the terms of the GNU General Public License 
--# as published by the Free Software Foundation; either 
--# version 2 of the License, or (at your option) any later 
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--SHELL = @SHELL@
-+@SET_MAKE@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = pgsql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libpgsqldbmail_la_DEPENDENCIES =
-+am__libpgsqldbmail_la_SOURCES_DIST = dbpgsql.c
-+@PGSQL_TRUE@am_libpgsqldbmail_la_OBJECTS = dbpgsql.lo
-+libpgsqldbmail_la_OBJECTS = $(am_libpgsqldbmail_la_OBJECTS)
-+@PGSQL_TRUE@am_libpgsqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgsqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libpgsqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +153,167 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- 
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
-+# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
-+#
-+# This program is free software; you can redistribute it and/or 
-+# modify it under the terms of the GNU General Public License 
-+# as published by the Free Software Foundation; either 
-+# version 2 of the License, or (at your option) any later 
-+# version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- @PGSQL_TRUE@AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer
--
- @PGSQL_TRUE@pkglib_LTLIBRARIES = libpgsqldbmail.la
--
- @PGSQL_TRUE@libpgsqldbmail_la_SOURCES = dbpgsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
-+@PGSQL_TRUE@libpgsqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libpgsqldbmail_la_LDFLAGS = 
--libpgsqldbmail_la_LIBADD = 
--@PGSQL_TRUE@libpgsqldbmail_la_OBJECTS =  dbpgsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbpgsql.P
--SOURCES = $(libpgsqldbmail_la_SOURCES)
--OBJECTS = $(libpgsqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu pgsql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pgsql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  pgsql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libpgsqldbmail_la_rpath) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbpgsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libpgsqldbmail.la: $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libpgsqldbmail_la_LDFLAGS) $(libpgsqldbmail_la_OBJECTS) $(libpgsqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = pgsql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pgsql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- buildtools/mkinstalldirs	Fri Aug 19 14:30:42 2005
-+++ buildtools/mkinstalldirs	Mon Dec 26 09:42:30 2005
-@@ -1,40 +1,158 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 802 2003-10-24 09:21:31Z ilja $
-+scriptversion=2005-06-29.22
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
- 
- errstatus=0
-+dirmode=
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
-+case $dirmode in
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
-+esac
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp"
--
--        mkdir "$pathcomp" || lasterr=$?
--
--        if test ! -d "$pathcomp"; then
--  	  errstatus=$lasterr
--        fi
--     fi
-+for file
-+do
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
--# mkinstalldirs ends here
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
---- buildtools/ltmain.sh	Mon Aug 22 12:09:45 2005
-+++ buildtools/ltmain.sh	Mon Dec 26 09:42:30 2005
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -17,7 +17,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -43,9 +43,14 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.6
--TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-+VERSION="1.5.20 Debian 1.5.20-2"
-+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
- 
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
- 
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -83,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  SP2NL='tr \040 \012'
-+  NL2SP='tr \015\012 \040\040'
-   ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+  SP2NL='tr \100 \n'
-+  NL2SP='tr \r\n \100\100'
-   ;;
- esac
- 
-@@ -107,8 +113,9 @@
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   $echo "$modename: not configured to build any kind of library" 1>&2
-@@ -138,7 +145,8 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--func_win32_libid () {
-+func_win32_libid ()
-+{
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-@@ -178,7 +186,8 @@
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- # arg is usually of the form 'gcc ...'
--func_infer_tag () {
-+func_infer_tag ()
-+{
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
-@@ -235,6 +244,108 @@
-       esac
-     fi
- }
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+
-+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
-+}
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    ${rm}r unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd "$darwin_orig_dir"
-+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	fi # $run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+        ;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+    func_extract_archives_result="$my_oldobjs"
-+}
- # End of Shell function definitions
- #####################################
- 
-@@ -305,10 +416,10 @@
-   --version)
-     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-     $echo "This is free software; see the source for copying conditions.  There is NO"
-     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --config)
-@@ -317,7 +428,7 @@
-     for tagname in $taglist; do
-       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-     done
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --debug)
-@@ -342,7 +453,7 @@
-     else
-       $echo "disable static libraries"
-     fi
--    exit $EXIT_SUCCESS
-+    exit $?
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -399,7 +510,7 @@
-   # Infer the operation mode.
-   if test -z "$mode"; then
-     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-     case $nonopt in
-     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-@@ -465,7 +576,7 @@
- 
-     for arg
-     do
--      case "$arg_mode" in
-+      case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
-@@ -547,7 +658,10 @@
-       case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
-+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+      # in scan sets (worked around with variable expansion),
-+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-+      # at all, so we specify them separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-@@ -621,6 +735,14 @@
-       esac
-     done
- 
-+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-+    case $qlibobj in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qlibobj="\"$qlibobj\"" ;;
-+    esac
-+    test "X$libobj" != "X$qlibobj" \
-+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-     if test "X$xdir" = "X$obj"; then
-@@ -693,12 +815,17 @@
- 	$run $rm $removelist
- 	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      $echo "$srcfile" > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
-+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-+    case $qsrcfile in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+      qsrcfile="\"$qsrcfile\"" ;;
-+    esac
- 
-     $run $rm "$libobj" "${libobj}T"
- 
-@@ -720,10 +847,10 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
-       if test ! -d "${xdir}$objdir"; then
-@@ -803,9 +930,9 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -1227,6 +1354,13 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        darwin_framework)
-+	  compiler_flags="$compiler_flags $arg"
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
-@@ -1285,6 +1419,14 @@
- 	continue
- 	;;
- 
-+      -framework|-arch)
-+        prev=darwin_framework
-+        compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+        continue
-+        ;;
-+
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -1345,7 +1487,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1356,7 +1498,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1366,8 +1508,20 @@
- 	continue
- 	;;
- 
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      -model)
-+	compile_command="$compile_command $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	finalize_command="$finalize_command $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	deplibs="$deplibs $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
- 	continue
- 	;;
- 
-@@ -1376,13 +1530,14 @@
- 	continue
- 	;;
- 
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m* pass through architecture-specific compiler args for GCC
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1858,7 +2013,7 @@
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    deplibs="$deplib $deplibs"
-+	    compiler_flags="$compiler_flags $deplib"
- 	  fi
- 	  continue
- 	  ;;
-@@ -1977,7 +2132,22 @@
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2051,6 +2221,8 @@
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
-+	avoidtemprpath=
-+
- 
- 	# Read the .la file
- 	case $lib in
-@@ -2149,11 +2321,19 @@
- 	    dir="$libdir"
- 	    absdir="$libdir"
- 	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
-@@ -2226,12 +2406,12 @@
- 	  if test -n "$library_names" &&
- 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath " in
- 	      *" $dir "*) ;;
- 	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      *) temp_rpath="$temp_rpath $absdir" ;;
- 	      esac
- 	    fi
- 
-@@ -2417,7 +2597,7 @@
- 		add_dir="-L$dir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
-+		  case $libdir in
- 		    [\\/]*)
- 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
-@@ -2490,7 +2670,7 @@
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
-+		case $libdir in
- 		  [\\/]*)
- 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
-@@ -2551,8 +2731,6 @@
- 	      fi
- 	    fi
- 	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
-@@ -2670,12 +2848,12 @@
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$depdepl $deplibs" ;;
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
-@@ -2947,7 +3125,7 @@
- 	case $current in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2956,7 +3134,7 @@
- 	case $revision in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2965,7 +3143,7 @@
- 	case $age in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- 	  exit $EXIT_FAILURE
- 	  ;;
-@@ -2991,7 +3169,7 @@
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -3197,7 +3375,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -3247,7 +3425,7 @@
- 	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" -ne "0"; then
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3284,7 +3462,7 @@
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
-@@ -3336,7 +3514,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test  "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3405,7 +3583,7 @@
- 	  set dummy $deplibs_check_method
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3646,6 +3824,9 @@
- 	        # The command line is too long to execute in one step.
- 	        $show "using reloadable object file for export list..."
- 	        skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
-@@ -3679,67 +3860,13 @@
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
--
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -3769,7 +3896,8 @@
- 	  fi
- 	fi
- 
--	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" &&
-+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
-@@ -3788,6 +3916,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
-+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -3797,13 +3926,13 @@
- 	  delfiles=
- 	  last_robj=
- 	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
-+	  output=$output_objdir/$output_la-${k}.$objext
- 	  # Loop over the list of objects to be linked.
- 	  for obj in $save_libobjs
- 	  do
- 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- 	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
-+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 		 test "$len" -le "$max_cmd_len"; }; then
- 	      objlist="$objlist $obj"
- 	    else
-@@ -3817,9 +3946,9 @@
- 		# the last one created.
- 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- 	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      last_robj=$output_objdir/$output_la-${k}.$objext
- 	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
-+	      output=$output_objdir/$output_la-${k}.$objext
- 	      objlist=$obj
- 	      len=1
- 	    fi
-@@ -3839,13 +3968,13 @@
- 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
- 
--	  # Set up a command to remove the reloadale object files
-+	  # Set up a command to remove the reloadable object files
- 	  # after they are used.
- 	  i=0
- 	  while test "$i" -lt "$k"
- 	  do
- 	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- 	  done
- 
- 	  $echo "creating a temporary reloadable object file: $output"
-@@ -3893,13 +4022,30 @@
- 	  IFS="$save_ifs"
- 	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
-+	  $run eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      $show "${rm}r $gentop"
-+	      $run ${rm}r "$gentop"
-+	    fi
-+	  fi
-+
- 	  exit $EXIT_SUCCESS
- 	fi
- 
-@@ -3977,64 +4123,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -4296,12 +4388,12 @@
- 
- 	    # Prepare the list of exported symbols
- 	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
-+	      export_symbols="$output_objdir/$outputname.exp"
- 	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
- 	  fi
-@@ -4353,7 +4445,26 @@
- #endif
- 
- /* The mapping between symbol names and symbols. */
-+"
-+
-+	    case $host in
-+	    *cygwin* | *mingw* )
-+	  $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs */
-+struct {
-+"
-+	      ;;
-+	    * )
-+	  $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+	      ;;
-+	    esac
-+
-+
-+	  $echo >> "$output_objdir/$dlsyms" "\
-   const char *name;
-   lt_ptr address;
- }
-@@ -4582,7 +4693,7 @@
- 	esac
- 	case $host in
- 	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- 	    cwrapper=`$echo ${output}.exe`
- 	    $rm $cwrappersource $cwrapper
- 	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-@@ -4681,6 +4792,7 @@
- EOF
- 
- 	    cat >> $cwrappersource <<"EOF"
-+  return 127;
- }
- 
- void *
-@@ -4815,7 +4927,7 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -4944,13 +5056,13 @@
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
- 	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
-@@ -4960,7 +5072,7 @@
-     fi
-   else
-     # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit $EXIT_FAILURE
-@@ -4992,71 +5104,73 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
--	  fi
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-        cmds=$old_archive_from_new_cmds
-       else
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "copying selected object files to avoid basename conflicts..."
-+
-+	  if test -z "$gentop"; then
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	  fi
-+
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		counter=`expr $counter + 1`
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      $run ln "$obj" "$gentop/$newobj" ||
-+	      $run cp "$obj" "$gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	if len=`expr "X$cmds" : ".*"` &&
-@@ -5070,20 +5184,7 @@
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
--	  fi
-+
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
-@@ -5094,7 +5195,7 @@
- 	    oldobjs="$objlist $obj"
- 	    objlist="$objlist $obj"
- 	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
-+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	       test "$len" -le "$max_cmd_len"; then
- 	      :
- 	    else
-@@ -5291,11 +5392,11 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+       $echo "X$nonopt" | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5304,14 +5405,14 @@
-       shift
-     else
-       install_prog=
--      arg="$nonopt"
-+      arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-     case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-     esac
-@@ -5329,28 +5430,31 @@
-     do
-       if test -n "$dest"; then
- 	files="$files $dest"
--	dest="$arg"
-+	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
-+      -f) 
-+      	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o) prev=$arg ;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
--      -*) ;;
--
-+      -*)
-+	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  prev=
- 	else
--	  dest="$arg"
-+	  dest=$arg
- 	  continue
- 	fi
- 	;;
-@@ -5359,7 +5463,7 @@
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5528,11 +5632,14 @@
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- 	      fi
- 	    done
- 	  fi
-@@ -5545,7 +5652,16 @@
- 	    IFS="$save_ifs"
- 	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
-+	    $run eval "$cmd" || {
-+	      lt_exit=$?
-+
-+	      # Restore the uninstalled library and exit
-+	      if test "$mode" = relink; then
-+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	      fi
-+
-+	      exit $lt_exit
-+	    }
- 	  done
- 	  IFS="$save_ifs"
- 	fi
-@@ -5639,17 +5755,15 @@
- 	  notinst_deplibs=
- 	  relink_command=
- 
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
-@@ -5677,17 +5791,15 @@
- 	  done
- 
- 	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  outputname=
-@@ -5728,7 +5840,7 @@
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
-+	# one anyway 
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
-@@ -6398,7 +6510,7 @@
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit $EXIT_SUCCESS
-+exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
---- auth/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ auth/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1404 2004-10-14 09:13:17Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = auth
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libauthdbmail_la_DEPENDENCIES =
-+am__libauthdbmail_la_SOURCES_DIST = authsql.c authldap.c
-+@LDAP_FALSE@am_libauthdbmail_la_OBJECTS = authsql.lo
-+@LDAP_TRUE@am_libauthdbmail_la_OBJECTS = authldap.lo
-+libauthdbmail_la_OBJECTS = $(am_libauthdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libauthdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libauthdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,108 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- AM_CFLAGS = -fomit-frame-pointer
--
- pkglib_LTLIBRARIES = libauthdbmail.la
--@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
- @LDAP_FALSE@libauthdbmail_la_SOURCES = authsql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libauthdbmail_la_LDFLAGS = 
--libauthdbmail_la_LIBADD = 
--@LDAP_TRUE@libauthdbmail_la_OBJECTS =  authldap.lo
--@LDAP_FALSE@libauthdbmail_la_OBJECTS =  authsql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/authldap.P .deps/authsql.P
--SOURCES = $(libauthdbmail_la_SOURCES)
--OBJECTS = $(libauthdbmail_la_OBJECTS)
-+@LDAP_TRUE@libauthdbmail_la_SOURCES = authldap.c
-+libauthdbmail_la_LIBADD = -lcrypt @LDAPLIB@ @SQLLIB@
-+all: all-am
- 
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu auth/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  auth/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  auth/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldap.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -226,173 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libauthdbmail.la: $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libauthdbmail_la_LDFLAGS) $(libauthdbmail_la_OBJECTS) $(libauthdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = auth
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu auth/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+pdf-am:
- 
-+ps: ps-am
- 
--#libauthdbmail_la_LIBADD = -lcrypt
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- sort/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ sort/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1535 2004-12-27 09:48:06Z paul $ 
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $ 
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = sort
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libsortdbmail_la_DEPENDENCIES =
-+am__libsortdbmail_la_SOURCES_DIST = sort.c sortsieve.c
-+@SIEVE_FALSE@am_libsortdbmail_la_OBJECTS = sort.lo
-+@SIEVE_TRUE@am_libsortdbmail_la_OBJECTS = sort.lo sortsieve.lo
-+libsortdbmail_la_OBJECTS = $(am_libsortdbmail_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libsortdbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libsortdbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,151 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- pkglib_LTLIBRARIES = libsortdbmail.la
--@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_FALSE@libsortdbmail_la_SOURCES = sort.c
-+@SIEVE_TRUE@libsortdbmail_la_SOURCES = sort.c sortsieve.c
- @SIEVE_TRUE@AM_CFLAGS = -DSIEVE
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libsortdbmail_la_LDFLAGS = 
--libsortdbmail_la_LIBADD = 
--@SIEVE_FALSE@libsortdbmail_la_OBJECTS =  sort.lo
--@SIEVE_TRUE@libsortdbmail_la_OBJECTS =  sort.lo sortsieve.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
--
-+libsortdbmail_la_LIBADD = @SORTLIB@
-+all: all-am
- 
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/sort.P .deps/sortsieve.P
--SOURCES = $(libsortdbmail_la_SOURCES)
--OBJECTS = $(libsortdbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu sort/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sort/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  sort/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortsieve.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +324,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libsortdbmail.la: $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libsortdbmail_la_LDFLAGS) $(libsortdbmail_la_OBJECTS) $(libsortdbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = sort
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sort/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- mysql/Makefile.in	Mon Aug 22 12:09:45 2005
-+++ mysql/Makefile.in	Mon Dec 26 09:42:34 2005
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
- 
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,7 +12,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# $Id: Makefile.am 1147 2004-05-28 14:05:20Z ilja $
-+@SET_MAKE@
-+
-+# $Id: Makefile.in 1941 2005-12-22 08:50:07Z paul $
- # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- #
- # This program is free software; you can redistribute it and/or 
-@@ -28,87 +32,138 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
--
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
--
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+subdir = mysql
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+libmysqldbmail_la_DEPENDENCIES =
-+am__libmysqldbmail_la_SOURCES_DIST = dbmysql.c
-+@MYSQL_TRUE@am_libmysqldbmail_la_OBJECTS = dbmysql.lo
-+libmysqldbmail_la_OBJECTS = $(am_libmysqldbmail_la_OBJECTS)
-+@MYSQL_TRUE@am_libmysqldbmail_la_rpath = -rpath $(pkglibdir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libmysqldbmail_la_SOURCES)
-+DIST_SOURCES = $(am__libmysqldbmail_la_SOURCES_DIST)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
- AR = @AR@
--AS = @AS@
- AUTHALIB = @AUTHALIB@
- AUTHLTLIB = @AUTHLTLIB@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--DLLTOOL = @DLLTOOL@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- F77 = @F77@
--GCJ = @GCJ@
--GCJFLAGS = @GCJFLAGS@
--HAVE_LIB = @HAVE_LIB@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDAPINC = @LDAPINC@
- LDAPLIB = @LDAPLIB@
--LIB = @LIB@
-+LDAP_FALSE = @LDAP_FALSE@
-+LDAP_TRUE = @LDAP_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--LTLIB = @LTLIB@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MYSQLINC = @MYSQLINC@
--OBJDUMP = @OBJDUMP@
-+MYSQL_FALSE = @MYSQL_FALSE@
-+MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PGSQLINC = @PGSQLINC@
-+PGSQL_FALSE = @PGSQL_FALSE@
-+PGSQL_TRUE = @PGSQL_TRUE@
- RANLIB = @RANLIB@
--RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- SIEVEINC = @SIEVEINC@
- SIEVELIB = @SIEVELIB@
-+SIEVE_FALSE = @SIEVE_FALSE@
-+SIEVE_TRUE = @SIEVE_TRUE@
- SORTALIB = @SORTALIB@
- SORTLTLIB = @SORTLTLIB@
- SQLALIB = @SQLALIB@
-@@ -116,107 +171,149 @@
- SQLLTLIB = @SQLLTLIB@
- STRIP = @STRIP@
- USE_DM_GETOPT = @USE_DM_GETOPT@
-+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@
-+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@
- VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
- mysqlconfig = @mysqlconfig@
-+oldincludedir = @oldincludedir@
- pgsqlconfig = @pgsqlconfig@
--
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- @MYSQL_TRUE@AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer 
--
- @MYSQL_TRUE@pkglib_LTLIBRARIES = libmysqldbmail.la
--
- @MYSQL_TRUE@libmysqldbmail_la_SOURCES = dbmysql.c
--mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
--CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(pkglib_LTLIBRARIES)
--
--
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
--libmysqldbmail_la_LDFLAGS = 
--libmysqldbmail_la_LIBADD = 
--@MYSQL_TRUE@libmysqldbmail_la_OBJECTS =  dbmysql.lo
--CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
-+@MYSQL_TRUE@libmysqldbmail_la_LIBADD = @SQLLIB@
-+all: all-am
- 
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--DEP_FILES =  .deps/dbmysql.P
--SOURCES = $(libmysqldbmail_la_SOURCES)
--OBJECTS = $(libmysqldbmail_la_OBJECTS)
--
--all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-pkglibLTLIBRARIES:
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--
--distclean-pkglibLTLIBRARIES:
--
--maintainer-clean-pkglibLTLIBRARIES:
--
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mysql/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  mysql/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
- 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
--# FIXME: We should only use cygpath when building on Windows,
--# and only if it is available.
--.c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--.s.o:
--	$(COMPILE) -c $<
--
--.S.o:
--	$(COMPILE) -c $<
-+clean-pkglibLTLIBRARIES:
-+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES) 
-+	$(LINK) $(am_libmysqldbmail_la_rpath) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.o core *.core
- 	-rm -f *.$(OBJEXT)
- 
--clean-compile:
--
- distclean-compile:
- 	-rm -f *.tab.c
- 
--maintainer-clean-compile:
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmysql.Plo@am__quote@
- 
--.s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
--.S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -225,171 +322,178 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
--maintainer-clean-libtool:
--
--libmysqldbmail.la: $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_DEPENDENCIES)
--	$(LINK) -rpath $(pkglibdir) $(libmysqldbmail_la_LDFLAGS) $(libmysqldbmail_la_OBJECTS) $(libmysqldbmail_la_LIBADD) $(LIBS)
--
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
- tags: TAGS
- 
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
--
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
--
--mostlyclean-tags:
--
--clean-tags:
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
--subdir = mysql
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	here=`cd $(top_builddir) && pwd`; \
--	top_distdir=`cd $(top_distdir) && pwd`; \
--	distdir=`cd $(distdir) && pwd`; \
--	cd $(top_srcdir) \
--	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu mysql/Makefile
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--
--DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--
---include $(DEP_FILES)
--
--mostlyclean-depend:
--
--clean-depend:
--
--distclean-depend:
--	-rm -rf .deps
--
--maintainer-clean-depend:
--
--%.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm .deps/$(*F).pp
--
--%.lo: %.c
--	@echo '$(LTCOMPILE) -c $<'; \
--	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--	  < .deps/$(*F).pp > .deps/$(*F).P; \
--	tr ' ' '\012' < .deps/$(*F).pp \
--	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--	    >> .deps/$(*F).P; \
--	rm -f .deps/$(*F).pp
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
- check-am: all-am
- check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am: install-pkglibLTLIBRARIES
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
- install-exec: install-exec-am
--
--install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am: uninstall-pkglibLTLIBRARIES
--uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
--
- 
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
--		mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+	mostlyclean-am
- 
--clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-depend clean-generic mostlyclean-am
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
--clean: clean-am
-+dvi: dvi-am
- 
--distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-depend \
--		distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
- 
--distclean: distclean-am
-+html: html-am
- 
--maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
--		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-depend \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
- 
--.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
--clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
--uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir \
--mostlyclean-depend distclean-depend clean-depend \
--maintainer-clean-depend info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-pkglibLTLIBRARIES install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-pkglibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- aclocal.m4	Mon Aug 22 12:09:45 2005
-+++ aclocal.m4	Mon Dec 26 09:42:35 2005
-@@ -1,1423 +1,19 @@
--dnl aclocal.m4t generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Do all the work for Automake.  This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN([AM_CONDITIONAL],
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--dnl  DBMAIL_MSG_CONFIGURE_START()
--dnl
--AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl
--AC_MSG_RESULT([
--This is dbmail's GNU configure script.
--It's going to run a bunch of strange tests to hopefully
--make your compile work without much twiddling.
--])
--])
--
--dnl DBMAIL_BOTH_SQL_CHECK
--dnl
--AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl
--AC_ARG_WITH(mysql,
--            [  --with-mysql            use MySQL as database. Uses mysql_config
--	       		  for finding includes and libraries],
--            mysqlheadername="$withval")
--AC_ARG_WITH(pgsql,
--	    [  --with-pgsql            use PostgreSQL as database. 
--                          Uses pg_config for finding includes and libraries],
--            pgsqlheadername="$withval")
--
--WARN=0
--# Make sure we only select one, mysql or pgsql
--if test "${mysqlheadername-x}" = "x"
--then
--  if test "${pgsqlheadername-x}" = "x"
--  then
--    NEITHER=1
--    mysqlheadername=""
--#    MYSQLINC=""
--#    PGSQLINC=""
--  fi
--fi
--if test "$NEITHER" = 1
--  then
--     AC_MSG_ERROR([
--
--     You have to specify --with-mysql or --with-pgsql to build.
--])
--fi
--
--if test ! "${mysqlheadername-x}" = "x"
--then
--  if test ! "${pgsqlheadername-x}" = "x"
--    then
--      WARN=1
--      mysqlheadername=""
--#      MYSQLINC=""
--#      PGSQLINC=""
--  fi
--fi
--if test "$WARN" = 1
--  then
--     AC_MSG_ERROR([
--
--     You cannot specify both --with-mysql and --with-pgsql on the same
--     build...
--])
--fi
--])
--
--dnl DBMAIL_CHECK_SQL_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl
--#Look for include files and libs needed to link
--#use the configuration utilities (mysql_config and pg_config for this)
--# MySQL first
--if test ! "${mysqlheadername-x}" = "x"
--then
--    AC_PATH_PROG(mysqlconfig,mysql_config)
--    if test [ -z "$mysqlconfig" ]
--    then
--        AC_MSG_ERROR([mysql_config executable not found. Make sure mysql_config is in your path])
--    else
--	AC_MSG_CHECKING([MySQL headers])
--	MYSQLINC=`${mysqlconfig} --cflags`
--	AC_MSG_RESULT([$MYSQLINC])	
--        AC_MSG_CHECKING([MySQL libraries])
--        SQLLIB=`${mysqlconfig} --libs`
--        SQLALIB="mysql/.libs/libmysqldbmail.a"
--	SQLLTLIB="mysql/libmysqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--   fi
--else
--  if test ! "${pgsqlheadername-x}" = "x"
--  then
--    AC_PATH_PROG(pgsqlconfig,pg_config)
--    if test [ -z "$pgsqlconfig" ]
--    then
--        AC_MSG_ERROR([pg_config executable not found. Make sure pg_config is in your path])
--    else
--	AC_MSG_CHECKING([PostgreSQL headers])
--	PGINCDIR=`${pgsqlconfig} --includedir`
--	PGSQLINC="-I$PGINCDIR"
--	AC_MSG_RESULT([$PGSQLINC])
--        AC_MSG_CHECKING([PostgreSQL libraries])
--        PGLIBDIR=`${pgsqlconfig} --libdir`
--        SQLLIB="-L$PGLIBDIR -lpq"
--        SQLALIB="pgsql/.libs/libpgsqldbmail.a"
--	SQLLTLIB="pgsql/libpgsqldbmail.la"
--        AC_MSG_RESULT([$SQLLIB])
--    fi
--  fi
--fi
--])
--dnl DBMAIL_SIEVE_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl
--AC_MSG_RESULT([checking for sorting configuration])
--AC_ARG_WITH(sieve,[  --with-sieve=PATH	  full path to libSieve header directory (don't use, not stable)],
--	sieveheadername="$withval$")
--dnl This always needs to be defined
--SORTALIB="sort/.libs/libsortdbmail.a"
--SORTLTLIB="sort/libsortdbmail.la"
--
--WARN=0
--if test ! "${sieveheadername-x}" = "x"
--then
--  # --with-sieve was specified
--  AC_MSG_RESULT([using Sieve sorting])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for sieve2_interface.h (user supplied)])
--    if test -r "$sieveheadername/sieve2_interface.h"
--      then
--      # found
--        AC_MSG_RESULT([$sieveheadername/sieve2_interface.h])
--        SIEVEINC=$sieveheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        SIEVEINC=""
--        sieveheadername=""
--        AC_MSG_ERROR([
--  Unable to find sieve2_inteface.h where you specified, try just --with-sieve to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for sieve2_interface.h])
--    for sievepaths in $sieveheaderpaths
--    do
--      if test -r "$sievepaths/sieve2_interface.h"
--      then
--        SIEVEINC="$sievepaths"
--        AC_MSG_RESULT([$sievepaths/sieve2_interface.h])
--        break
--      fi
--    done
--    if test -z "$SIEVEINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate sieve2_inteface.h, try specifying with --with-sieve])
--    fi
--  fi
--else
--  AC_MSG_RESULT([not using any sorting])
--fi
--])
--
--dnl DBMAIL_CHECK_SIEVE_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl
--# Look for libs needed to link to SIEVE first
--if test ! "${sieveheadername-x}" = "x"
--then
--  AC_CHECK_LIB(sieve,sieve2_listextensions,[ SIEVELIB="-lsieve"], [SIEVELIB=""])
--  if test -z "$SIEVELIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against libSieve.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no Sieve needed
--  SIEVELIB=""
--fi
--])
--	
--dnl DBMAIL_AUTH_CONF
--dnl check for ldap or sql authentication
--AC_DEFUN(DBMAIL_AUTH_CONF, [dnl
--AC_MSG_RESULT([checking for authentication configuration])
--AC_ARG_WITH(auth-ldap,[  --with-auth-ldap=PATH	  full path to ldap header directory],
--	authldapheadername="$withval$")
--dnl This always needs to be defined
--AUTHALIB="auth/.libs/libauthdbmail.a"
--AUTHLTLIB="auth/libauthdbmail.la"
--
--WARN=0
--if test ! "${authldapheadername-x}" = "x"
--then
--  # --with-auth-ldap was specified
--  AC_MSG_RESULT([using LDAP authentication])
--  if test "$withval" != "yes"
--  then
--    AC_MSG_CHECKING([for ldap.h (user supplied)])
--    if test -r "$authldapheadername/ldap.h"
--      then
--      # found
--        AC_MSG_RESULT([$authldapheadername/ldap.h])
--        LDAPINC=$authldapheadername
--      else 
--      # Not found
--        AC_MSG_RESULT([not found])
--        LDAPINC=""
--        authldapheadername=""
--        AC_MSG_ERROR([
--  Unable to find ldap.h where you specified, try just --with-auth-ldap to 
--  have configure guess])
--    fi
--  else
--    # Lets look in our standard paths
--    AC_MSG_CHECKING([for ldap.h])
--    for ldappaths in $ldapheaderpaths
--    do
--      if test -r "$ldappaths/ldap.h"
--      then
--        LDAPINC="$ldappaths"
--        AC_MSG_RESULT([$ldappaths/ldap.h])
--        break
--      fi
--    done
--    if test -z "$LDAPINC"
--    then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([
--  Unable to locate ldap.h, try specifying with --with-ldap])
--    fi
--  fi
--else
--  AC_MSG_RESULT([using SQL authentication])
--fi
--])
--
--dnl DBMAIL_CHECK_LDAP_LIBS
--dnl
--AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl
--# Look for libs needed to link to LDAP first
--if test ! "${authldapheadername-x}" = "x"
--then
--  AC_CHECK_LIB(ldap,ldap_bind,[ LDAPLIB="-lldap"], [LDAPLIB=""])
--  if test -z "$LDAPLIB"
--  then
--    AC_MSG_ERROR([
--  Unable to link against ldap.  It appears you are missing the
--  development libraries or they aren't in your linker's path
--  ])
--  fi
--else
--  #no ldap needed
--  LDAPLIB=""
--fi
--])
--dnl AC_COMPILE_WARNINGS
--dnl set to compile with '-W -Wall'
--AC_DEFUN([AC_COMPILE_WARNINGS],
--[AC_MSG_CHECKING(maximum warning verbosity option)
--if test -n "$CXX"
--then
--  if test "$GXX" = "yes"
--  then
--    ac_compile_warnings_opt='-Wall'
--  fi
--  CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
--fi
--if test -n "$CC"
--then
--  if test "$GCC" = "yes"
--  then
--    ac_compile_warnings_opt='-W -Wall -Wpointer-arith -Wstrict-prototypes'
--  fi
--  CFLAGS="$CFLAGS $ac_compile_warnings_opt"
--  ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
--fi
--AC_MSG_RESULT($ac_compile_warnings_msg)
--unset ac_compile_warnings_msg
--unset ac_compile_warnings_opt
--])
--
--# ----------------------------------------------------------------
--# DBMAIL_CHECK_GC
--# I cheated I copied from w3m's acinclude.m4 :)
--# Modified for DBMAIL by Dan Weber
--# ----------------------------------------------------------------
--AC_DEFUN([DBMAIL_CHECK_GC],
--[AC_MSG_CHECKING(for --with-gc)
--AC_ARG_WITH(gc,
-- [  --with-gc[=PREFIX]        libgc PREFIX],
-- [test x"$with_gc" = xno && with_gc="no"],
-- [with_gc="no"])
-- AC_MSG_RESULT($with_gc)
--# Don't check for gc if not appended to command line
-- if test x"$with_gc" = xyes
-- then
-- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
-- unset ac_cv_header_gc_h
-- AC_CHECK_HEADER(gc/gc.h)
-- if test x"$ac_cv_header_gc_h" = xno; then
--   AC_MSG_CHECKING(GC header location)
--   AC_MSG_RESULT($with_gc)
--   gcincludedir=no
--   for dir in $with_gc; do
--     for inc in include include/gc; do
--       cflags="$CFLAGS"
--       CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"
--       AC_MSG_CHECKING($dir/$inc)
--       unset ac_cv_header_gc_h
--       AC_CHECK_HEADER(gc/gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"; break])
--       CFLAGS="$cflags"
--     done
--     if test x"$gcincludedir" != xno; then
--       break;
--     fi
--   done
--   if test x"$gcincludedir" = xno; then
--     AC_MSG_ERROR([gc/gc.h not found])
--   fi
-- else
--  cflags="$CFLAGS -DUSE_GC=1"
--  CFLAGS="$cflags"
-- fi
-- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-- if test x"$ac_cv_lib_gc_GC_init" = xno; then
--    AC_MSG_CHECKING(GC library location)
--    AC_MSG_RESULT($with_gc)
--    gclibdir=no
--    for dir in $with_gc; do
--      ldflags="$LDFLAGS"
--      LDFLAGS="$LDFLAGS -L$dir/lib"
--      AC_MSG_CHECKING($dir)
--      unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
--      LDFLAGS="$ldflags"
--    done
--    if test x"$gclibdir" = xno; then
--      AC_MSG_ERROR([libgc not found])
--    fi
-- fi
--fi])
--
--# getopt.m4 serial 6
--dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# The getopt module assume you want GNU getopt, with getopt_long etc,
--# rather than vanilla POSIX getopt.  This means your your code should
--# always include <getopt.h> for the getopt prototypes.
--
--AC_DEFUN([CHECK_GETOPT_SUBSTITUTE],
--[
--  GETOPT_H=getopt.h
--  AC_LIBOBJ([getopt])
--  AC_LIBOBJ([getopt1])
--  AC_DEFINE([USE_DM_GETOPT], 1,
--    [Define if my_getopt should be used instead of the system's getopt.])
--  USE_DM_GETOPT=1
--  AC_SUBST([USE_DM_GETOPT])
--])
--
--AC_DEFUN([DBMAIL_CHECK_GETOPT],
--[
--  CHECK_PREREQ_GETOPT
--
--  if test -z "$GETOPT_H"; then
--    GETOPT_H=
--    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
--    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
--
--    dnl BSD getopt_long uses an incompatible method to reset option processing,
--    dnl and (as of 2004-10-15) mishandles optional option-arguments.
--    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
--
--    if test -n "$GETOPT_H"; then
--      CHECK_GETOPT_SUBSTITUTE
--    fi
--  fi
--])
--
--# Prerequisites of lib/getopt*.
--AC_DEFUN([CHECK_PREREQ_GETOPT], [:])
--
--#
--# socklen_t
--# from curl
--
--dnl Check for socklen_t: historically on BSD it is an int, and in
--dnl POSIX 1g it is a type of its own, but some platforms use different
--dnl types for the argument to getsockopt, getpeername, etc.  So we
--dnl have to test to find something that will work.
--AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T],
--[
--   AC_CHECK_TYPE([socklen_t], ,[
--      AC_MSG_CHECKING([for socklen_t equivalent])
--      AC_CACHE_VAL([socklen_t_equiv],
--      [
--         # Systems have either "struct sockaddr *" or
--         # "void *" as the second argument to getpeername
--         socklen_t_equiv=
--         for arg2 in "struct sockaddr" void; do
--            for t in int size_t unsigned long "unsigned long"; do
--               AC_TRY_COMPILE([
--                  #include <sys/types.h>
--                  #include <sys/socket.h>
--
--                  int getpeername (int, $arg2 *, $t *);
--               ],[
--                  $t len;
--                  getpeername(0,0,&len);
--               ],[
--                  socklen_t_equiv="$t"
--                  break
--               ])
--            done
--         done
--
--         if test "x$socklen_t_equiv" = x; then
--            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
--         fi
--      ])
--      AC_MSG_RESULT($socklen_t_equiv)
--      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
--                        [type to use in place of socklen_t if not defined])],
--      [#include <sys/types.h>
--#include <sys/socket.h>])
--])
--
--
--# lib-prefix.m4 serial 4 (gettext-0.14.2)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
--dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
--dnl require excessive bracketing.
--ifdef([AC_HELP_STRING],
--[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
--[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
--
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
--
--# lib-link.m4 serial 6 (gettext-0.14.3)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_PREREQ(2.50)
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
--  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
--
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
--
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
--
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  acl_cv_prog_gnu_ld=yes ;;
--*)
--  acl_cv_prog_gnu_ld=no ;;
--esac])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
--
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# Prepare PATH_SEPARATOR.
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break ;;
--      *)
--	test "$with_gnu_ld" != yes && break ;;
--      esac
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
--])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 47 AC_PROG_LIBTOOL
--# Debian $Rev: 214 $
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1527,7 +123,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
- 
- # Same as above, but do not quote variable references.
-@@ -1547,7 +143,7 @@
- default_ofile=libtool
- can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -1595,6 +191,8 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+_LT_CC_BASENAME([$compiler])
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -1640,6 +238,48 @@
- ])# _LT_AC_SYS_COMPILER
- 
- 
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
- # Links a minimal program and checks the executable
-@@ -1712,15 +352,15 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -1889,7 +529,7 @@
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*linux*)
-@@ -1971,7 +611,7 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1981,8 +621,10 @@
-    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-      fi
-    fi
-@@ -2008,11 +650,16 @@
-    LDFLAGS="$LDFLAGS $3"
-    printf "$lt_simple_link_test_code" > conftest.$ac_ext
-    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
-+     # The linker can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-      else
-        $2=yes
-      fi
-@@ -2071,11 +718,38 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-- *)
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
-@@ -2180,7 +854,7 @@
- }]
- EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) $1 ;;
-@@ -2329,7 +1003,7 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2341,11 +1015,13 @@
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-      fi
-    fi
--   chmod u+w .
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-    $rm conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
-@@ -2409,8 +1085,8 @@
- [AC_MSG_CHECKING([how to hardcode library paths into programs])
- _LT_AC_TAGVAR(hardcode_action, $1)=
- if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2577,7 +1253,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2605,7 +1281,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -2635,7 +1312,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -2658,7 +1335,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -2693,8 +1370,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -2712,7 +1398,7 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -2739,7 +1425,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     shrext_cmds='.so'
-     hardcode_into_libs=yes
-@@ -2838,7 +1524,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -2913,7 +1599,11 @@
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -3079,7 +1769,9 @@
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  AC_LIBTOOL_LANG_CXX_CONFIG
- 	else
- 	  tagname=""
-@@ -3141,7 +1833,7 @@
- 
- # AC_LIBTOOL_WIN32_DLL
- # --------------------
--# declare package support for building win32 dll's
-+# declare package support for building win32 DLLs
- AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
- [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
- ])# AC_LIBTOOL_WIN32_DLL
-@@ -3315,7 +2007,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -3425,7 +2117,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -3457,7 +2149,7 @@
- AC_DEFUN([AC_PROG_LD_GNU],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -3484,6 +2176,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- ])# AC_PROG_LD_RELOAD_FLAG
- 
- 
-@@ -3517,7 +2218,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[[45]]*)
-   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3540,13 +2241,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -3562,7 +2263,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3612,12 +2313,10 @@
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -3738,13 +2437,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl convenience library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-convenience to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!).  If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
- AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case $enable_ltdl_convenience in
-@@ -3763,13 +2462,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl installable library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!).  If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-install to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
- AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -3807,10 +2506,21 @@
- # ---------------
- AC_DEFUN([_LT_AC_LANG_CXX],
- [AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
- ])# _LT_AC_LANG_CXX
- 
-+# _LT_AC_PROG_CXXCPP
-+# ---------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
- 
- # AC_LIBTOOL_F77
- # --------------
-@@ -3883,6 +2593,10 @@
- 
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -3933,7 +2647,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -3946,43 +2660,6 @@
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
-     ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -4008,7 +2685,7 @@
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_PUSH(C++)
- AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -4037,7 +2714,7 @@
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
- 
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
- 
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -4052,6 +2729,10 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -4073,7 +2754,7 @@
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -4180,7 +2861,7 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-     if test "$GXX" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -4201,6 +2882,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -4246,7 +2930,7 @@
- 	# Exported symbols can be pulled into shared objects from archives
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
-+	# This is similar to how AIX traditionally builds its shared libraries.
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-@@ -4260,6 +2944,7 @@
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -4283,65 +2968,76 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-       fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
--    ;;
-+        ;;
- 
-   dgux*)
-     case $cc_basename in
--      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4352,14 +3048,14 @@
- 	;;
-     esac
-     ;;
--  freebsd[12]*)
-+  freebsd[[12]]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4376,11 +3072,11 @@
- 				# location of the library.
- 
-     case $cc_basename in
--    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
--    aCC)
-+    aCC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-@@ -4390,7 +3086,7 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
-@@ -4404,7 +3100,7 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -4420,7 +3116,7 @@
-         ;;
-       esac
-     fi
--    case "$host_cpu" in
-+    case $host_cpu in
-     hppa*64*)
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4441,12 +3137,12 @@
-     esac
- 
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      aCC)
--	case "$host_cpu" in
-+      aCC*)
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	  ;;
-@@ -4467,7 +3163,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- 	      ;;
-@@ -4485,9 +3181,9 @@
-     ;;
-   irix5* | irix6*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -4498,7 +3194,7 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
- 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
-@@ -4511,7 +3207,7 @@
-     ;;
-   linux*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4536,17 +3232,41 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
--      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      cxx)
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -4577,7 +3297,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
--      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4598,9 +3318,25 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  openbsd*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4616,14 +3352,14 @@
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4641,7 +3377,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4660,7 +3396,7 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
--      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
-@@ -4675,17 +3411,17 @@
- 	# the KAI C++ compiler.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- 	;;
--      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      cxx)
-+      cxx*)
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4704,7 +3440,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4728,7 +3464,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -4740,12 +3476,12 @@
-     ;;
-   sunos4*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
--      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4758,36 +3494,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
--      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
--	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
- 
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -4795,7 +3528,7 @@
- 	# in the archive.
- 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- 	;;
--      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
-@@ -4838,7 +3571,7 @@
-     ;;
-   tandem*)
-     case $cc_basename in
--      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4944,7 +3677,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -5020,6 +3753,21 @@
- 
- $rm -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    ;;
-+  esac
-+esac
-+])
-+
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -5070,12 +3818,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
- 
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-@@ -5085,7 +3837,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -5094,7 +3846,9 @@
-   fi
-   ;;
- aix4* | aix5*)
--  test "$enable_shared" = yes && enable_static=no
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-   ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -5145,20 +3899,27 @@
- lt_simple_compile_test_code="class foo {}\n"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
- 
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- 
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- 
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
- AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
- AC_LIBTOOL_PROG_COMPILER_PIC($1)
- AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -5201,11 +3962,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
- 
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- 
- AC_LIBTOOL_CONFIG($1)
-@@ -5341,7 +4107,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -5352,11 +4118,11 @@
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -5387,6 +4153,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -5463,7 +4235,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
- 
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -5737,9 +4509,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -5761,6 +4530,13 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDGIRSTW]]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[[BCDEGRST]]'
-   ;;
-@@ -5792,8 +4568,11 @@
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -5957,7 +4736,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	;;
-       *)
-@@ -5982,18 +4761,28 @@
- 	;;
-       chorus*)
- 	case $cc_basename in
--	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
--	  ec++)
-+	  ec++*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
--	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6001,22 +4790,22 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- 	    if test "$host_cpu" != ia64; then
- 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- 	    fi
- 	    ;;
--	  aCC)
-+	  aCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -6031,7 +4820,7 @@
- 	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -6042,18 +4831,24 @@
- 	;;
-       linux*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
--	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -6070,7 +4865,7 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
--	  cxx)
-+	  cxx*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- 	    ;;
- 	  *)
-@@ -6081,14 +4876,14 @@
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
--	  KCC)
-+	  KCC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    ;;
--	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
--	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -6104,7 +4899,7 @@
- 	;;
-       sco*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -6113,13 +4908,13 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- 	    ;;
--	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- 	    ;;
-@@ -6129,12 +4924,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
--	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	    ;;
--	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- 	    ;;
-@@ -6144,7 +4939,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
--	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    ;;
-@@ -6215,7 +5010,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6241,6 +5036,16 @@
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -6252,7 +5057,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -6276,12 +5081,19 @@
-       ;;
- 
-     linux*)
--      case $CC in
-+      case $cc_basename in
-       icc* | ecc*)
- 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-       ccc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         # All Alpha code is PIC.
-@@ -6302,9 +5114,14 @@
-       ;;
- 
-     solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-       ;;
- 
-     sunos4*)
-@@ -6326,6 +5143,11 @@
-       fi
-       ;;
- 
-+    unicos*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-     uts4*)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6353,7 +5175,7 @@
-     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
- fi
--case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -6386,7 +5208,7 @@
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux*)
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6432,7 +5254,8 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
--
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  _LT_CC_BASENAME([$compiler])
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -6452,6 +5275,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -6502,7 +5346,7 @@
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_AC_TAGVAR(always_export_symbols, $1)=no
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-@@ -6516,7 +5360,39 @@
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
--	ld_shlibs=no
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
-@@ -6551,39 +5427,13 @@
-       fi
-       ;;
- 
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--  linux*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--      fi
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6594,16 +5444,11 @@
-       ;;
-     esac
- 
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
--      runpath_var=LD_RUN_PATH
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--      fi
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -6667,7 +5512,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.[012]|aix4.[012].*)
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -6688,6 +5533,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -6732,7 +5580,7 @@
- 	  # Exported symbols can be pulled into shared objects from archives
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-@@ -6746,7 +5594,7 @@
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[[45]]*)
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-@@ -6767,57 +5615,57 @@
-       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
- 
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      case "$host_os" in
--      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
-+      case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -6851,7 +5699,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6876,7 +5724,7 @@
- 
-     hpux10* | hpux11*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
-@@ -6885,7 +5733,7 @@
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	  ;;
-@@ -6895,7 +5743,7 @@
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
-+	case $host_cpu in
- 	hppa*64*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -6962,6 +5810,7 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-@@ -7007,7 +5856,7 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -7026,10 +5875,12 @@
-     solaris*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-       if test "$GCC" = yes; then
-+	wlarc='${wl}'
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -7038,8 +5889,18 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       case $host_os in
-       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-@@ -7300,7 +6161,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
-+  test ! -f $lt_ac_sed && continue
-   cat /dev/null > conftest.in
-   lt_ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7325,8 +6186,887 @@
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- ])
-+SED=$lt_cv_path_SED
- AC_MSG_RESULT([$SED])
- ])
- 
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
diff --git a/mail/dbmail22/pkg-descr b/mail/dbmail22/pkg-descr
deleted file mode 100644
index 2c03d30b6ea9..000000000000
--- a/mail/dbmail22/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Dbmail is the name of a group of programs that enable the possiblilty of storing
-and retrieving mail messages from a database (currently MySQL or PostgreSQL).
-
-What are the advantages?
-
-    * Scalability.
-      Dbmail is as scalable as the database that is used for the mail storage.
-    * Manageability.
-      Dbmail is based upon a database. Dbmail can be managed by changing
-      settings in the database (f.e. using PHP/Perl/SQL).
-    * Speed.
-      Dbmail uses very efficient, database specific queries for retrieving mail
-      information. This is much faster then parsing a filesystem.
-    * Security.
-      Dbmail has got nothing to do with the filesystem or interaction with other
-      programs in the Unix environment which need special permissions.  Dbmail
-      is as secure as the database it's based upon.
-    * Flexibility.
-      Changes on a Dbmail system (adding of users, changing passwords etc.) are
-      effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
deleted file mode 100644
index dc430f4e2413..000000000000
--- a/mail/dbmail22/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-etc/dbmail.conf-dist
-lib/dbmail/libauthdbmail.so.0
-lib/dbmail/libauthdbmail.a
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libauthdbmail.so
-lib/dbmail/libsortdbmail.so.0
-lib/dbmail/libsortdbmail.a
-lib/dbmail/libsortdbmail.la
-lib/dbmail/libsortdbmail.so
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
-%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
-%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%lib/dbmail/libmysqldbmail.so.0
-%%MYSQL%%lib/dbmail/libmysqldbmail.a
-%%MYSQL%%lib/dbmail/libmysqldbmail.la
-%%MYSQL%%lib/dbmail/libmysqldbmail.so
-%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so.0
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.so
-@dirrm lib/dbmail
-@dirrm %%DATADIR%%/sql
-@dirrm %%DATADIR%%
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
deleted file mode 100644
index bc13f5e16f25..000000000000
--- a/mail/dovecot-devel/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	dovecot
-# Date created:				12/08/2002
-# Whom:			Dominic Marks <dominic.marks@btinternet.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dovecot
-DISTVERSION=	1.0.beta3
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.dovecot.org/releases/
-
-MAINTAINER=	robin@isometry.net
-COMMENT=	Secure and compact IMAP and POP3 servers
-
-USE_ICONV=	yes
-USE_RC_SUBR=	dovecot.sh
-
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	USE-WIKI-INSTEAD \
-		auth-protocol.txt auth.txt configuration.txt design.txt \
-		index.txt mail-storages.txt multiaccess.txt nfs.txt \
-		securecoding.txt variables.txt
-.else
-CONFIGURE_ARGS+=	--without-docs
-.endif
-
-OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
-		SASL2		"SASL2 support"		off \
-		GSSAPI		"GSSAPI support"	off \
-		VPOPMAIL	"VPopMail support"	off \
-		LDAP		"OpenLDAP support"	off \
-		PGSQL		"PostgreSQL support"	off \
-		MYSQL		"MySQL support"		off \
-		SQLITE		"SQLite support"	off
-
-.include <bsd.port.pre.mk>
-
-## kqueue(2) support
-#
-.if !defined(WITHOUT_KQUEUE)
-CONFIGURE_ARGS+=	--with-ioloop=kqueue --with-notify=kqueue
-.endif
-
-## SASL2 support
-#
-.if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.endif
-
-## GSSAPI support
-#
-.if defined(WITH_GSSAPI)
-CONFIGURE_ARGS+=	--with-gssapi
-.else
-CONFIGURE_ARGS+=	--without-gssapi
-.endif
-
-## VPopMail Support
-#
-.if defined(WITH_VPOPMAIL)
-VPOPMAIL=		${LOCALBASE}/vpopmail/bin/vchkpw
-BUILD_DEPENDS+=		${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
-CONFIGURE_ARGS+=	--with-vpopmail
-.else
-CONFIGURE_ARGS+=	--without-vpopmail
-.endif
-
-## OpenLDAP Support
-#
-.if defined(WITH_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.endif
-
-## PostgreSQL Support
-#
-.if defined(WITH_PGSQL)
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-pgsql
-.endif
-
-## MySQL Support
-#
-.if defined(WITH_MYSQL)
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql
-.endif
-
-## SQLite Support
-#
-.if defined(WITH_SQLITE)
-USE_SQLITE=		3
-CONFIGURE_ARGS+=	--with-sqlite
-.endif
-
-post-build:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
-		${WRKSRC}/dovecot-example.conf
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR}
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
-		${.CURDIR}/pkg-message >${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
deleted file mode 100644
index 1338f2df8130..000000000000
--- a/mail/dovecot-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dovecot-1.0.beta3.tar.gz) = 5418f9f7fe99e4f10bb82d9fe504138a
-SHA256 (dovecot-1.0.beta3.tar.gz) = c283111cd57c7938356c3f564eec6a8e4ba066f5c448f209e305a1409232520e
-SIZE (dovecot-1.0.beta3.tar.gz) = 1360574
diff --git a/mail/dovecot-devel/files/dovecot.sh.in b/mail/dovecot-devel/files/dovecot.sh.in
deleted file mode 100644
index 4d6d3ecc21a8..000000000000
--- a/mail/dovecot-devel/files/dovecot.sh.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dovecot
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dovecot:
-#
-#dovecot_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=dovecot
-rcvar=`set_rcvar`
-
-: ${dovecot_enable:="NO"}
-command=%%PREFIX%%/sbin/${name}
-required_files=%%PREFIX%%/etc/${name}.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
deleted file mode 100644
index db540085bb01..000000000000
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ /dev/null
@@ -1,153 +0,0 @@
---- dovecot-example.conf.orig	Fri Feb 10 18:46:38 2006
-+++ dovecot-example.conf	Fri Feb 10 18:51:23 2006
-@@ -7,7 +7,7 @@
- # Default values are shown after each value, it's not required to uncomment
- # any of the lines. Exception to this are paths, they're just examples
- # with real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-+# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
- # --with-ssldir=/etc/ssl
- 
- # Base directory where to store runtime data.
-@@ -15,7 +15,7 @@
- 
- # Protocols we want to be serving:
- #  imap imaps pop3 pop3s
--#protocols = imap imaps
-+protocols = imap pop3
- 
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -104,7 +104,7 @@
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
--#login_process_size = 32
-+login_process_size = 64
- 
- # Should each login be processed in it's own process (yes), or should one
- # login process be allowed to process multiple connections (no)? Yes is more
-@@ -153,7 +153,7 @@
- # Show more verbose process titles (in ps). Currently shows user name and
- # IP address. Useful for seeing who are actually using the IMAP processes
- # (eg. shared mailboxes or if same uid is used for multiple accounts).
--#verbose_proctitle = no
-+verbose_proctitle = yes
- 
- # Show protocol level SSL errors.
- #verbose_ssl = no
-@@ -169,12 +169,12 @@
- # non-valid GID as primary group ID aren't allowed to log in. If user
- # belongs to supplementary groups with non-valid GIDs, those groups are
- # not set.
--#first_valid_gid = 1
-+first_valid_gid = 0
- #last_valid_gid = 0
- 
- # Grant access to these extra groups for mail processes. Typical use would be
- # to give "mail" group write access to /var/mail to be able to create dotlocks.
--#mail_extra_groups =
-+mail_extra_groups = mail
- 
- # ':' separated list of directories under which chrooting is allowed for mail
- # processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
-@@ -210,7 +210,7 @@
- #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
- #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
- #
--#default_mail_env = 
-+default_mail_env = mbox:/var/mail/%u
- 
- # If you need to set multiple mailbox locations or want to change default
- # namespace settings, you can do it by defining namespace sections:
-@@ -420,19 +420,19 @@
- 
- protocol imap {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/imap-login
-+  #login_executable = %%PREFIX%%/libexec/dovecot/imap-login
- 
-   # IMAP executable location. Changing this allows you to execute other
-   # binaries before the imap process is executed.
-   #
-   # This would write rawlogs into ~/dovecot.rawlog/ directory:
--  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = %%PREFIX%%/libexec/dovecot/rawlog %%PREFIX%%/libexec/dovecot/imap
-   #
-   # This would attach gdb into the imap process and write backtraces into
-   # /tmp/gdbhelper.* files:
--  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+  #   mail_executable = %%PREFIX%%/libexec/dovecot/gdbhelper %%PREFIX%%/libexec/dovecot/imap
-   #
--  #mail_executable = /usr/libexec/dovecot/imap
-+  #mail_executable = %%PREFIX%%/libexec/dovecot/imap
- 
-   # Maximum IMAP command line length in bytes. Some clients generate very long
-   # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -441,7 +441,7 @@
- 
-   # Support for dynamically loadable modules.
-   #mail_use_modules = no
--  #mail_modules = /usr/lib/dovecot/imap
-+  #mail_modules = %%PREFIX%%/lib/dovecot/imap
- 
-   # Send IMAP capabilities in greeting message. This makes it unnecessary for
-   # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -472,7 +472,7 @@
-   #     but not both. Thunderbird separates these two by forcing server to
-   #     accept '/' suffix in mailbox names in subscriptions list.
-   # The list is space-separated.
--  #imap_client_workarounds = outlook-idle
-+  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
- }
-   
- ##
-@@ -481,10 +481,10 @@
- 
- protocol pop3 {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
- 
-   # POP3 executable location
--  #mail_executable = /usr/libexec/dovecot/pop3
-+  #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
- 
-   # Don't try to set mails non-recent or seen with POP3 sessions. This is
-   # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -521,7 +521,7 @@
-   # installations. %08Xu%08Xv will be the new default, so use it for new
-   # installations.
-   #
--  #pop3_uidl_format = 
-+  pop3_uidl_format = %08Xu%08Xv
- 
-   # POP3 logout format string:
-   #  %t - number of TOP commands
-@@ -535,7 +535,7 @@
- 
-   # Support for dynamically loadable modules.
-   #mail_use_modules = no
--  #mail_modules = /usr/lib/dovecot/pop3
-+  #mail_modules = %%PREFIX%%/lib/dovecot/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -545,7 +545,7 @@
-   #     Outlook Express and Netscape Mail breaks if end of headers-line is
-   #     missing. This option simply sends it if it's missing.
-   # The list is space-separated.
--  #pop3_client_workarounds = 
-+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
- }
- 
- ##
-@@ -553,7 +553,7 @@
- ##
- 
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
diff --git a/mail/dovecot-devel/pkg-deinstall b/mail/dovecot-devel/pkg-deinstall
deleted file mode 100644
index 21c58498bdbe..000000000000
--- a/mail/dovecot-devel/pkg-deinstall
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-#
-# ex:ts=4
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	echo ${answer:-${default}}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-		[Yy]*)	return 0;;
-		[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-delete_account() {
-	local u
-
-	u=$1
-	if yesno "Do you want me to remove user \"${u}\"" n; then
-		pw userdel -n ${u}
-		echo "Done."
-	fi
-}
-
-case $2 in
-
-DEINSTALL)
-	if ps -axc | grep -qw dovecot; then
-		if yesno "Dovecot is still running. Shall I stop it?" y; then
-			killall dovecot
-			sleep 2
-		else
-			echo "OK ... I hope you know what you are doing."
-		fi
-	fi
-
-	delete_account dovecot
-
-	base=/var/run/dovecot
-	DIRLIST="${base}/login ${base}"
-	echo "Cleaning up \"${base}\"."
-	for directory in ${DIRLIST}; do
-		rmdir ${directory} 2>/dev/null || :
-	done
-	;;
-
-esac
diff --git a/mail/dovecot-devel/pkg-descr b/mail/dovecot-devel/pkg-descr
deleted file mode 100644
index d5a19d0d489c..000000000000
--- a/mail/dovecot-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Dovecot is a secure and compact IMAP server which is in the early stages
-of developement. It supports Maildirs and mbox formats and much of the
-IMAP v4 protocol including SSL/TLS. IPv6 support is also included.
-Dovecot supports authentication with OpenLDAP, PostgreSQL, MySQL, vpopmail
-and PAM.
-
-WWW: http://www.dovecot.org/
diff --git a/mail/dovecot-devel/pkg-install b/mail/dovecot-devel/pkg-install
deleted file mode 100644
index 648a4ecf06f4..000000000000
--- a/mail/dovecot-devel/pkg-install
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# ex:ts=4
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	echo ${answer:-${default}}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-		[Yy]*)	return 0;;
-		[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-make_account() {
-	local u g gcos
-
-	u=$1
-	g=$2
-	gcos=$3
-
-	if pw group show "${g}" >/dev/null 2>&1; then
-		echo "You already have a group \"${g}\", so I will use it."
-	else
-		echo "You need a group \"${g}\"."
-		if which -s pw && yesno "Would you like me to create it" y
-		then
-			pw groupadd ${g} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-    
-	if pw user show "${u}" >/dev/null 2>&1; then
-		echo "You already have a user \"${u}\", so I will use it."
-	else
-		echo "You need a user \"${u}\"."
-		if which -s pw && yesno "Would you like me to create it" y
-		then
-			pw useradd ${u} -g ${g} -c "${gcos}" -d /nonexistent -s /sbin/nologin -h - || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-}
-
-case $2 in
-
-PRE-INSTALL)
-	make_account dovecot dovecot "Dovecot"
-	;;
-
-POST-INSTALL)
-	base=/var/run/dovecot
-	DIRLIST="${base} ${base}/login"
-	echo "Fixing ownerships and modes in \"${base}\"."
-	for directory in ${DIRLIST}; do
-		if [ ! -d "${directory}" ]; then
-			mkdir -p ${directory}
-			echo "Created directory: ${directory}"
-		fi
-	done
-	chown -R root:wheel   ${base}
-	chmod -R 0700         ${base}
-	chown -R root:dovecot ${base}/login
-	chmod -R 0750         ${base}/login
-	;;
-
-esac
diff --git a/mail/dovecot-devel/pkg-message b/mail/dovecot-devel/pkg-message
deleted file mode 100644
index 7169bd0bfa6f..000000000000
--- a/mail/dovecot-devel/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
----------------------------------------------------------------------
- 
- You can get default configured IMAP and POP3 services running by
- copying the sample configuration file to the given location and then
- enabling dovecot in /etc/rc.conf.
- In this simple configuration Dovecot will authenticate users against
- the systems passwd file and use the default /var/mail/$USER mbox
- files.
-
-  cd %%PREFIX%%/etc; cp dovecot-example.conf dovecot.conf
-  
-  echo dovecot_enable="YES" >> /etc/rc.conf
- 
- Further information on configuration can be found in:
-
-  %%DOCSDIR%%
-
----------------------------------------------------------------------
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
deleted file mode 100644
index 22f38d9970a3..000000000000
--- a/mail/dovecot-devel/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment $FreeBSD$
-etc/dovecot-example.conf
-lib/dovecot/imap/lib01_convert_plugin.so
-lib/dovecot/imap/lib01_quota_plugin.so
-lib/dovecot/imap/lib01_zlib_plugin.a
-lib/dovecot/imap/lib01_zlib_plugin.la
-lib/dovecot/imap/lib01_zlib_plugin.so
-lib/dovecot/imap/lib02_imap_quota_plugin.a
-lib/dovecot/imap/lib02_imap_quota_plugin.la
-lib/dovecot/imap/lib02_imap_quota_plugin.so
-lib/dovecot/imap/lib02_trash_plugin.so
-@dirrm lib/dovecot/imap
-lib/dovecot/pop3/lib01_convert_plugin.so
-@dirrm lib/dovecot/pop3
-lib/dovecot/lda/lib01_convert_plugin.so
-lib/dovecot/lda/lib01_quota_plugin.so
-lib/dovecot/lda/lib02_trash_plugin.so
-@dirrm lib/dovecot/lda
-lib/dovecot/lib01_convert_plugin.a
-lib/dovecot/lib01_convert_plugin.la
-lib/dovecot/lib01_convert_plugin.so
-lib/dovecot/lib01_quota_plugin.a
-lib/dovecot/lib01_quota_plugin.la
-lib/dovecot/lib01_quota_plugin.so
-lib/dovecot/lib02_trash_plugin.a
-lib/dovecot/lib02_trash_plugin.la
-lib/dovecot/lib02_trash_plugin.so
-@dirrm lib/dovecot
-libexec/dovecot/checkpassword-reply
-libexec/dovecot/dict
-libexec/dovecot/dovecot-auth
-libexec/dovecot/gdbhelper
-libexec/dovecot/imap
-libexec/dovecot/imap-login
-libexec/dovecot/pop3
-libexec/dovecot/pop3-login
-libexec/dovecot/rawlog
-libexec/dovecot/ssl-build-param
-@dirrm libexec/dovecot
-sbin/dovecot
-sbin/dovecotpw
-share/dovecot/mkcert.sh
-@dirrm share/dovecot
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
deleted file mode 100644
index e2cb3cce4352..000000000000
--- a/mail/heirloom-mailx/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	nail
-# Date created:				20 October 2000
-# Whom:					Kris Kennaway <kris@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nail
-PORTVERSION=	11.25
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ehaupt@FreeBSD.org
-COMMENT=	BSD mail utility with MIME extensions
-
-USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_OPENSSL=	yes
-MAKE_ARGS=	PREFIX="${PREFIX}" \
-		SYSCONFDIR="${PREFIX}/etc" \
-		SENDMAIL="/usr/sbin/sendmail" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		IPv6="-DHAVE_IPv6_FUNCS"
-
-MAN1=		nail.1
-PLIST_FILES=	bin/nail \
-		"@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \
-		"etc/nail.rc.default" \
-		"@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc"
-
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
-.if !exists(${PREFIX}/etc/nail.rc)
-	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
deleted file mode 100644
index 9f928a83a4e9..000000000000
--- a/mail/heirloom-mailx/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7
-SHA256 (nail-11.25.tar.bz2) = ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
-SIZE (nail-11.25.tar.bz2) = 267959
diff --git a/mail/heirloom-mailx/pkg-descr b/mail/heirloom-mailx/pkg-descr
deleted file mode 100644
index 0b4272e2f2f4..000000000000
--- a/mail/heirloom-mailx/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-BSD mail utility with MIME extensions
-
-WWW: http://nail.sourceforge.net/
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
deleted file mode 100644
index 2420d84e6d10..000000000000
--- a/mail/horde-imp/Makefile
+++ /dev/null
@@ -1,252 +0,0 @@
-# Ports collection makefile for:  imp3
-# Date created:			  Mon Oct 08, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	imp
-PORTVERSION=	4.0.4
-PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
-		ftp://ftp.planetmirror.com/pub/horde/imp/		\
-		ftp://ftp.au.horde.org/pub/horde/imp/			\
-		ftp://ftp.be.horde.org/imp/				\
-		ftp://ftp.es.horde.org/pub/imp/				\
-		http://ftp.horde.org/pub/imp/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	A webmail system which accesses mail over IMAP
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP	: if you do not need OpenLDAP;
-#
-# - WITHOUT_SMIME	: disable S/MIME;
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-# - WITHOUT_ASPELL	: for spelling bees...
-#
-# - WITH_ISPELL		: if you prefer ispell;
-#
-# - NOCRYPT		: if crypto is restricted in your country;
-#
-# - WITHOUT_SSL		: if you have not installed c-client WITH_SSL;
-#
-# - WITH_VALID_CERT	: if you own a valid SSL certificate;
-#
-# - WITHOUT_INGO	: if you don't need filters management;
-#
-# - WITHOUT_NAG		: if you don't want tasks management;
-#
-# - WITHOUT_TURBA	: if you do not want adressbooks;
-#
-# - WITH_HTML		: enable HTML composition mode;
-#
-# - WITHOUT_IMAPSERVER	: if your IMAP server runs on another machine;
-#
-# or you can select to work with one of these servers:
-#
-# - WITH_CYRUS-IMAPD	: IMP will work with cyrus-imapd;
-#
-# - WITH_IMAP-UW	: IMP will work with imap-uw;
-#
-# - WITH_DOVECOT	: IMP will work with dovecot;
-#
-# - WITH_COURIER-IMAP	: IMP will work with courier-imap.
-#
-# These choices are mutually exclusive, and imap-uw is the default.
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
-
-CONFLICTS=	imp-3.*
-
-USE_PHP=	imap
-.if defined(WITHOUT_TURBA)
-. if !defined(WITHOUT_LDAP)
-USE_PHP+=	ldap
-. endif
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-.else
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/turba
-.endif
-
-.if !defined(WITHOUT_INGO)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/ingo
-.endif
-
-.if !defined(WITHOUT_NAG)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/nag
-.endif
-
-.if !defined(WITHOUT_SMIME)
-USE_PHP+=	openssl
-.endif
-
-.if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
-.endif
-
-.if !defined(WITHOUT_ASPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
-.elif defined(WITH_ISPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
-.endif
-
-.if defined(WITH_HTML)
-RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-.endif
-
-NO_BUILD=	yes
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_GETTEXT=	yes
-REINPLACE_ARGS=	-i.beforeIMP
-
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES  docs/TODO  docs/UPGRADING
-CONFFILE=	filter.txt header.txt menu.php mime_drivers.php motd.php \
-		prefs.php servers.php trailer.txt
-SUB_DIRS=	config js lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LIMPDIR=	${LHORDEDIR}/imp
-PEARDIR?=	${LOCALBASE}/share/pear
-
-PLIST_SUB=	IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
-
-IMPDIR=		${PREFIX}/${LIMPDIR}
-CONFDIR=	${IMPDIR}/config
-
-HOSTNAME?=	`/bin/hostname`
-SERVOS?=	${OPSYS}-${OSREL}
-
-PORTREV_H?=	${LOCALBASE}/include/c-client/portrevision.h
-
-PATCH2RM=	prefs.php.dist.orig servers.php.dist.orig conf.xml.orig	\
-		conf.xml.beforeIMP servers.php.dist.beforeIMP
-
-.include <bsd.port.pre.mk>
-
-# I have no report about the support of dkimap4 by IMP,
-# but I shall be happy to add it if someone report success with it.
-# If an IMAP server is already installed, we just record the dependence,
-# else we shall install imap-uw.
-# IMAP servers are ordered according to my tastes, if several are
-# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
-. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+=	${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
-. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
-RUN_DEPENDS+=	${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
-. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/imap:${PORTSDIR}/mail/dovecot
-. else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-. endif
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes/
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde/
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_IMAPSERVER)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITHOUT_IMAPSERVER"
-	@${ECHO_MSG} "if you intend to run an IMAP server on an other machine."
-	@${ECHO_MSG} ""
-.endif
-
-pre-configure:
-	@${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml
-.if !defined(WITHOUT_ASPELL)
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \
-		${WRKSRC}/config/conf.xml
-.elif defined(WITH_ISPELL)
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \
-		${WRKSRC}/config/conf.xml
-.else
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml
-.endif
-.if !defined(NOCRYPT)
-	@${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \
-		${WRKSRC}/config/conf.xml
-.else
-	@${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
-.endif
-	@${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':"	\
-		${WRKSRC}/lib/MIME/Headers.php
-	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g"	\
-		${WRKSRC}/config/servers.php.dist
-.if defined(WITHOUT_SSL)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:"	\
-		${WRKSRC}/config/servers.php.dist
-.else
-	@${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
-. if defined(WITH_VALID_CERT)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
-. else
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:"	\
-		${WRKSRC}/config/servers.php.dist
-. endif
-.endif
-	@${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:"		\
-		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf
-.for fc in ${PATCH2RM}
-	@${RM} ${WRKSRC}/config/${fc}
-.endfor
-	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP
-
-pre-install:
-.if !defined(BATCH) && !defined(WITHOUT_SSL)
-	@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure c-client with SSL support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-
-do-install:
-	@${MKDIR}  ${IMPDIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${IMPDIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
deleted file mode 100644
index 22d57099697c..000000000000
--- a/mail/horde-imp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
-SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
-SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde-imp/files/httpd.conf.imp b/mail/horde-imp/files/httpd.conf.imp
deleted file mode 100644
index edd7b1df357e..000000000000
--- a/mail/horde-imp/files/httpd.conf.imp
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for IMP
-#
-# For security, don't serve pages from the IMP configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/imp/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of IMP configuration ================
-
diff --git a/mail/horde-imp/files/patch-ab b/mail/horde-imp/files/patch-ab
deleted file mode 100644
index 0ef811fa652d..000000000000
--- a/mail/horde-imp/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
---- config/servers.php.dist.orig	Sun Dec 12 07:36:51 2004
-+++ config/servers.php.dist	Fri Dec 24 00:27:59 2004
-@@ -47,7 +47,7 @@
-  *
-  * folders: The folder path for the IMAP server.
-  *          Common values:
-- *            UW-IMAP               'mail/'  (note the trailing slash)
-+ *            UW-IMAP               'Mail/'  (note the trailing slash)
-  *            Cyrus, Courier-IMAP   'INBOX.' (note the trailing dot)
-  *            dovecot               ''
-  *
-@@ -174,14 +174,16 @@
- 
- $servers['imap'] = array(
-     'name' => 'IMAP Server',
--    'server' => 'imap.example.com',
-+//  'server' => 'imap.example.com',
-+    'server' => 'localhost',
-     'hordeauth' => false,
--    'protocol' => 'imap/notls',
--    'port' => 143,
--    'folders' => 'mail/',
-+    'protocol' => '%%PROTOCOL%%',
-+    'port' => %%IMAPPORT%%,
-+    'folders' => 'Mail/',
-     'namespace' => '',
-     'maildomain' => 'example.com',
--    'smtphost' => 'smtp.example.com',
-+//  'smtphost' => 'smtp.example.com',
-+    'smtphost' => 'localhost',
-     'smtpport' => 25,
-     'realm' => '',
-     'preferred' => '',
diff --git a/mail/horde-imp/files/patch-ac b/mail/horde-imp/files/patch-ac
deleted file mode 100644
index 68730ef6fde4..000000000000
--- a/mail/horde-imp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig	Fri Oct 29 19:04:12 2004
-+++ config/prefs.php.dist	Thu Nov 11 21:49:05 2004
-@@ -1071,7 +1071,7 @@
- // 'value' => "source_one\tsource_two"
- // refer to turba/config/sources.php for possible source values
- $_prefs['search_sources'] = array(
--    'value' => "",
-+    'value' => 'localsql',
-     'locked' => false,
-     'shared' => false,
-     'type' => 'implicit');
diff --git a/mail/horde-imp/files/patch-config::conf.xml b/mail/horde-imp/files/patch-config::conf.xml
deleted file mode 100644
index 225acb1a99c1..000000000000
--- a/mail/horde-imp/files/patch-config::conf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
---- config/conf.xml.orig	Mon Nov 22 09:40:29 2004
-+++ config/conf.xml	Mon Nov 29 11:51:54 2004
-@@ -6,11 +6,11 @@
-    <configheader>External Utilities</configheader>
-    <configstring name="spellchecker" required="false" desc="Enter the location
-    of the binary to either aspell or ispell to enable the spell checker. If
--   this is empty, then spell checking will be disabled."></configstring>
-+   this is empty, then spell checking will be disabled.">%%ASPELL%%</configstring>
-    <configstring name="gnupg" required="false" desc="If you want users to have
-    the option of using the GNU Privacy Guard program to decrypt/encrypt PGP
-    files, enter the location of the 'gpg' binary here.  If this is empty this
--   feature will be disabled."></configstring>
-+   feature will be disabled.">%%GPG%%</configstring>
-    <configmultienum name="gnupg_keyserver" required="false" desc="The address of
-    the public PGP keyserver(s) to use.">wwwkeys.pgp.net
-     <values>
-@@ -23,7 +23,7 @@
-    connecting to the PGP keyserver. Timeouts are not supported on all
-    systems.">10</configstring>
-    <configstring name="openssl_cafile" required="false" desc="The location of
--   the root certificates bundle.">/somewhere/ca-bundle.crt</configstring>
-+   the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
-    <configstring name="openssl_binary" required="false" desc="The location of
-    the OpenSSL binary on your system. This program is REQUIRED to import
-    personal S/MIME certificate information, as there is no native PHP function
diff --git a/mail/horde-imp/files/pkg-deinstall.in b/mail/horde-imp/files/pkg-deinstall.in
deleted file mode 100644
index 13bb805c47d5..000000000000
--- a/mail/horde-imp/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup IMP config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde-imp/files/pkg-message.in b/mail/horde-imp/files/pkg-message.in
deleted file mode 100644
index 78a666232a4a..000000000000
--- a/mail/horde-imp/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-************************************************************************
-IMP has been installed in %%IMPDIR%% with your blank
-configuration files.
-
-Horde must be configured and the tables created; if not, see
-`pkg_info -D -x horde'.
-
-Then, you might have to tune the configuration files located in
-%%CONFDIR%%/, specially the file servers.php.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration. Please read %%DOCSDIR%%/INSTALL.
-
-Warning: the filter system of IMP 3.x has been replaced by a separate
-******** application => check the port mail/ingo. Ingo provides a script
-         to migrate the existing filter rules from IMP 3.x, see Ingo's
-         documentation.
-
-To protect your configuration files, you have to restart Apache.
-
-To secure your installation, it is at least recommended that you change
-the default database password used by horde and imp.
-Then, you might change the 'session.save_path' setting in php.ini to a
-directory only readable and writeable by your webserver.
-************************************************************************
diff --git a/mail/horde-imp/pkg-descr b/mail/horde-imp/pkg-descr
deleted file mode 100644
index b085871c38de..000000000000
--- a/mail/horde-imp/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-IMP is the Internet Messaging Program. It is written in PHP and provides
-webmail access to IMAP and POP3 accounts.
-
-WWW: http://www.horde.org/imp/
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
deleted file mode 100644
index 5d37825d02a8..000000000000
--- a/mail/horde-imp/pkg-plist
+++ /dev/null
@@ -1,502 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%IMPDIR%%/acl.php
-%%IMPDIR%%/attachment.php
-%%IMPDIR%%/compose.php
-%%IMPDIR%%/config/.htaccess
-%%IMPDIR%%/config/conf.xml
-%%IMPDIR%%/config/filter.txt
-%%IMPDIR%%/config/filter.txt.dist
-%%IMPDIR%%/config/header.txt
-%%IMPDIR%%/config/header.txt.dist
-%%IMPDIR%%/config/menu.php
-%%IMPDIR%%/config/menu.php.dist
-%%IMPDIR%%/config/mime_drivers.php
-%%IMPDIR%%/config/mime_drivers.php.dist
-%%IMPDIR%%/config/motd.php
-%%IMPDIR%%/config/motd.php.dist
-%%IMPDIR%%/config/prefs.php
-%%IMPDIR%%/config/prefs.php.dist
-%%IMPDIR%%/config/servers.php
-%%IMPDIR%%/config/servers.php.dist
-%%IMPDIR%%/config/trailer.txt
-%%IMPDIR%%/config/trailer.txt.dist
-%%IMPDIR%%/contacts.php
-%%IMPDIR%%/expand.php
-%%IMPDIR%%/fetchmail.php
-%%IMPDIR%%/fetchmailprefs.php
-%%IMPDIR%%/filterprefs.php
-%%IMPDIR%%/folders.php
-%%IMPDIR%%/index.php
-%%IMPDIR%%/js/ieEscGuard.js
-%%IMPDIR%%/lib/.htaccess
-%%IMPDIR%%/lib/Auth/imp.php
-%%IMPDIR%%/lib/Block/summary.php
-%%IMPDIR%%/lib/Block/tree_folders.php
-%%IMPDIR%%/lib/Compose.php
-%%IMPDIR%%/lib/Crypt/PGP.php
-%%IMPDIR%%/lib/Crypt/SMIME.php
-%%IMPDIR%%/lib/Fetchmail.php
-%%IMPDIR%%/lib/Fetchmail/imap.php
-%%IMPDIR%%/lib/Filter.php
-%%IMPDIR%%/lib/Folder.php
-%%IMPDIR%%/lib/IMAP.php
-%%IMPDIR%%/lib/IMAP/Tree.php
-%%IMPDIR%%/lib/IMP.php
-%%IMPDIR%%/lib/Identity/imp.php
-%%IMPDIR%%/lib/MIME/Contents.php
-%%IMPDIR%%/lib/MIME/Headers.php
-%%IMPDIR%%/lib/MIME/Viewer/alternative.php
-%%IMPDIR%%/lib/MIME/Viewer/appledouble.php
-%%IMPDIR%%/lib/MIME/Viewer/enriched.php
-%%IMPDIR%%/lib/MIME/Viewer/html.php
-%%IMPDIR%%/lib/MIME/Viewer/images.php
-%%IMPDIR%%/lib/MIME/Viewer/itip.php
-%%IMPDIR%%/lib/MIME/Viewer/multipart.php
-%%IMPDIR%%/lib/MIME/Viewer/notification.php
-%%IMPDIR%%/lib/MIME/Viewer/partial.php
-%%IMPDIR%%/lib/MIME/Viewer/pgp.php
-%%IMPDIR%%/lib/MIME/Viewer/pkcs7.php
-%%IMPDIR%%/lib/MIME/Viewer/plain.php
-%%IMPDIR%%/lib/MIME/Viewer/related.php
-%%IMPDIR%%/lib/MIME/Viewer/rfc822.php
-%%IMPDIR%%/lib/MIME/Viewer/status.php
-%%IMPDIR%%/lib/MIME/Viewer/tnef.php
-%%IMPDIR%%/lib/MIME/Viewer/zip.php
-%%IMPDIR%%/lib/Mailbox.php
-%%IMPDIR%%/lib/Maillog.php
-%%IMPDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/fetchmail_login.php
-%%IMPDIR%%/lib/Maintenance/Task/purge_trash.php
-%%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/tos_agreement.php
-%%IMPDIR%%/lib/Maintenance/imp.php
-%%IMPDIR%%/lib/Message.php
-%%IMPDIR%%/lib/Notification/Listener/status.php
-%%IMPDIR%%/lib/Quota.php
-%%IMPDIR%%/lib/Quota/command.php
-%%IMPDIR%%/lib/Quota/courier.php
-%%IMPDIR%%/lib/Quota/cyrus.php
-%%IMPDIR%%/lib/Quota/logfile.php
-%%IMPDIR%%/lib/Quota/mdaemon.php
-%%IMPDIR%%/lib/Quota/mercury32.php
-%%IMPDIR%%/lib/Search.php
-%%IMPDIR%%/lib/Session.php
-%%IMPDIR%%/lib/Spam.php
-%%IMPDIR%%/lib/VFolder.php
-%%IMPDIR%%/lib/api.php
-%%IMPDIR%%/lib/base.php
-%%IMPDIR%%/lib/prefs.php
-%%IMPDIR%%/lib/version.php
-%%IMPDIR%%/locale/.htaccess
-%%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ca_ES/help.xml
-%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/cs_CZ/help.xml
-%%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/da_DK/help.xml
-%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/de_DE/help.xml
-%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/el_GR/help.xml
-%%IMPDIR%%/locale/en_US/help.xml
-%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/es_ES/help.xml
-%%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/et_EE/help.xml
-%%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fa_IR/help.xml
-%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fi_FI/help.xml
-%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fr_FR/help.xml
-%%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/hu_HU/help.xml
-%%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/is_IS/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/it_IT/help.xml
-%%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ko_KR/help.xml
-%%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nb_NO/help.xml
-%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nl_NL/help.xml
-%%IMPDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pl_PL/help.xml
-%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pt_BR/help.xml
-%%IMPDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pt_PT/help.xml
-%%IMPDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ru_RU/help.xml
-%%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sk_SK/help.xml
-%%IMPDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sv_SE/help.xml
-%%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/uk_UA/help.xml
-%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_CN/help.xml
-%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_TW/help.xml
-%%IMPDIR%%/login.php
-%%IMPDIR%%/mailbox.php
-%%IMPDIR%%/message.php
-%%IMPDIR%%/pgp.php
-%%IMPDIR%%/po/.htaccess
-%%IMPDIR%%/po/README
-%%IMPDIR%%/po/ar_OM.po
-%%IMPDIR%%/po/ar_SY.po
-%%IMPDIR%%/po/bg_BG.po
-%%IMPDIR%%/po/bs_BA.po
-%%IMPDIR%%/po/ca_ES.po
-%%IMPDIR%%/po/cs_CZ.po
-%%IMPDIR%%/po/da_DK.po
-%%IMPDIR%%/po/de_DE.po
-%%IMPDIR%%/po/el_GR.po
-%%IMPDIR%%/po/es_ES.po
-%%IMPDIR%%/po/et_EE.po
-%%IMPDIR%%/po/fa_IR.po
-%%IMPDIR%%/po/fi_FI.po
-%%IMPDIR%%/po/fr_FR.po
-%%IMPDIR%%/po/gl_ES.po
-%%IMPDIR%%/po/hu_HU.po
-%%IMPDIR%%/po/id_ID.po
-%%IMPDIR%%/po/imp.pot
-%%IMPDIR%%/po/is_IS.po
-%%IMPDIR%%/po/it_IT.po
-%%IMPDIR%%/po/ja_JP.po
-%%IMPDIR%%/po/ko_KR.po
-%%IMPDIR%%/po/lt_LT.po
-%%IMPDIR%%/po/lv_LV.po
-%%IMPDIR%%/po/mk_MK.po
-%%IMPDIR%%/po/nb_NO.po
-%%IMPDIR%%/po/nl_NL.po
-%%IMPDIR%%/po/nn_NO.po
-%%IMPDIR%%/po/pl_PL.po
-%%IMPDIR%%/po/pt_BR.po
-%%IMPDIR%%/po/pt_PT.po
-%%IMPDIR%%/po/ro_RO.po
-%%IMPDIR%%/po/ru_RU.po
-%%IMPDIR%%/po/sk_SK.po
-%%IMPDIR%%/po/sl_SI.po
-%%IMPDIR%%/po/sv_SE.po
-%%IMPDIR%%/po/th_TH.po
-%%IMPDIR%%/po/tr_TR.po
-%%IMPDIR%%/po/uk_UA.po
-%%IMPDIR%%/po/zh_CN.po
-%%IMPDIR%%/po/zh_TW.po
-%%IMPDIR%%/recompose.php
-%%IMPDIR%%/redirect.php
-%%IMPDIR%%/scripts/.htaccess
-%%IMPDIR%%/scripts/Imp.reg
-%%IMPDIR%%/scripts/custom_login.php
-%%IMPDIR%%/scripts/singlescript.php
-%%IMPDIR%%/search.php
-%%IMPDIR%%/smime.php
-%%IMPDIR%%/spelling.php
-%%IMPDIR%%/templates/.htaccess
-%%IMPDIR%%/templates/acl/acl.inc
-%%IMPDIR%%/templates/common-header.inc
-%%IMPDIR%%/templates/compose/attachments.inc
-%%IMPDIR%%/templates/compose/attachments.js
-%%IMPDIR%%/templates/compose/compose.inc
-%%IMPDIR%%/templates/compose/compose.js
-%%IMPDIR%%/templates/compose/compose_expand.js
-%%IMPDIR%%/templates/compose/encrypt_list.inc
-%%IMPDIR%%/templates/compose/expand.inc
-%%IMPDIR%%/templates/compose/recompose.inc
-%%IMPDIR%%/templates/compose/redirect.inc
-%%IMPDIR%%/templates/compose/spelling.inc
-%%IMPDIR%%/templates/compose/spelling.js
-%%IMPDIR%%/templates/compose/success.inc
-%%IMPDIR%%/templates/contacts/contacts.inc
-%%IMPDIR%%/templates/fetchmail/account_select.inc
-%%IMPDIR%%/templates/fetchmail/driver_select.inc
-%%IMPDIR%%/templates/fetchmail/fetchmail.inc
-%%IMPDIR%%/templates/fetchmail/manage.inc
-%%IMPDIR%%/templates/fetchmail/top.inc
-%%IMPDIR%%/templates/filters/notactive.inc
-%%IMPDIR%%/templates/filters/prefs.inc
-%%IMPDIR%%/templates/folders/actions.inc
-%%IMPDIR%%/templates/folders/folders.html
-%%IMPDIR%%/templates/folders/folders_confirm.html
-%%IMPDIR%%/templates/folders/foot.inc
-%%IMPDIR%%/templates/folders/head.inc
-%%IMPDIR%%/templates/folders/import.inc
-%%IMPDIR%%/templates/folders/javascript.inc
-%%IMPDIR%%/templates/javascript/open_compose_win.js
-%%IMPDIR%%/templates/javascript/open_print_win.js
-%%IMPDIR%%/templates/login/login.inc
-%%IMPDIR%%/templates/mailbox/actions.inc
-%%IMPDIR%%/templates/mailbox/actions_deleted.inc
-%%IMPDIR%%/templates/mailbox/alert.inc
-%%IMPDIR%%/templates/mailbox/empty_mailbox.inc
-%%IMPDIR%%/templates/mailbox/footer.inc
-%%IMPDIR%%/templates/mailbox/header.inc
-%%IMPDIR%%/templates/mailbox/javascript.inc
-%%IMPDIR%%/templates/mailbox/legend.inc
-%%IMPDIR%%/templates/mailbox/mailbox.html
-%%IMPDIR%%/templates/mailbox/message_footers.inc
-%%IMPDIR%%/templates/mailbox/message_headers.inc
-%%IMPDIR%%/templates/mailbox/navbar.inc
-%%IMPDIR%%/templates/mailbox/searchfolder.inc
-%%IMPDIR%%/templates/menu.inc
-%%IMPDIR%%/templates/message/headers.inc
-%%IMPDIR%%/templates/message/javascript.inc
-%%IMPDIR%%/templates/message/message.inc
-%%IMPDIR%%/templates/message/navbar_actions.inc
-%%IMPDIR%%/templates/message/navbar_navigate.inc
-%%IMPDIR%%/templates/message/navbar_top.inc
-%%IMPDIR%%/templates/pgp/import_key.inc
-%%IMPDIR%%/templates/pgp/notactive.inc
-%%IMPDIR%%/templates/pgp/open_pgp_import.js
-%%IMPDIR%%/templates/pgp/open_pgp_win.js
-%%IMPDIR%%/templates/pgp/passphrase.inc
-%%IMPDIR%%/templates/pgp/pgp.inc
-%%IMPDIR%%/templates/prefs/encryptselect.inc
-%%IMPDIR%%/templates/prefs/folderselect.inc
-%%IMPDIR%%/templates/prefs/initialpageselect.inc
-%%IMPDIR%%/templates/prefs/sentmailselect.inc
-%%IMPDIR%%/templates/prefs/sourceselect.inc
-%%IMPDIR%%/templates/prefs/spamselect.inc
-%%IMPDIR%%/templates/prefs/trashselect.inc
-%%IMPDIR%%/templates/quota/quota.inc
-%%IMPDIR%%/templates/search/fields.inc
-%%IMPDIR%%/templates/search/header.inc
-%%IMPDIR%%/templates/search/javascript.inc
-%%IMPDIR%%/templates/search/main.inc
-%%IMPDIR%%/templates/smime/import_key.inc
-%%IMPDIR%%/templates/smime/notactive.inc
-%%IMPDIR%%/templates/smime/open_smime_import.js
-%%IMPDIR%%/templates/smime/open_smime_win.js
-%%IMPDIR%%/templates/smime/passphrase.inc
-%%IMPDIR%%/templates/smime/smime.inc
-%%IMPDIR%%/templates/thread/bottom.inc
-%%IMPDIR%%/templates/thread/thread.html
-%%IMPDIR%%/templates/thread/top.inc
-%%IMPDIR%%/test.php
-%%IMPDIR%%/themes/azur/screen.css
-%%IMPDIR%%/themes/bluemoon/screen.css
-%%IMPDIR%%/themes/bluewhite/screen.css
-%%IMPDIR%%/themes/brown/screen.css
-%%IMPDIR%%/themes/burntorange/screen.css
-%%IMPDIR%%/themes/cherry/screen.css
-%%IMPDIR%%/themes/cornflower/screen.css
-%%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/graphics/addressbook-blue.png
-%%IMPDIR%%/themes/graphics/addressbook-red.png
-%%IMPDIR%%/themes/graphics/apple.png
-%%IMPDIR%%/themes/graphics/attachment.png
-%%IMPDIR%%/themes/graphics/compose.png
-%%IMPDIR%%/themes/graphics/empty_trash.png
-%%IMPDIR%%/themes/graphics/encrypted.png
-%%IMPDIR%%/themes/graphics/expand.png
-%%IMPDIR%%/themes/graphics/favicon.ico
-%%IMPDIR%%/themes/graphics/fetchmail.png
-%%IMPDIR%%/themes/graphics/filters.png
-%%IMPDIR%%/themes/graphics/folders/drafts.png
-%%IMPDIR%%/themes/graphics/folders/folder.png
-%%IMPDIR%%/themes/graphics/folders/folder_open.png
-%%IMPDIR%%/themes/graphics/folders/inbox.png
-%%IMPDIR%%/themes/graphics/folders/sent.png
-%%IMPDIR%%/themes/graphics/folders/templates.png
-%%IMPDIR%%/themes/graphics/folders/trash.png
-%%IMPDIR%%/themes/graphics/forward.png
-%%IMPDIR%%/themes/graphics/imp.png
-%%IMPDIR%%/themes/graphics/mail_answered.png
-%%IMPDIR%%/themes/graphics/mail_deleted.png
-%%IMPDIR%%/themes/graphics/mail_draft.png
-%%IMPDIR%%/themes/graphics/mail_flagged.png
-%%IMPDIR%%/themes/graphics/mail_personal.png
-%%IMPDIR%%/themes/graphics/mail_priority_high.png
-%%IMPDIR%%/themes/graphics/mail_priority_low.png
-%%IMPDIR%%/themes/graphics/mail_unseen.png
-%%IMPDIR%%/themes/graphics/manage_attachments.png
-%%IMPDIR%%/themes/graphics/mime/binary.png
-%%IMPDIR%%/themes/graphics/mime/compressed.png
-%%IMPDIR%%/themes/graphics/mime/encryption.png
-%%IMPDIR%%/themes/graphics/mime/html.png
-%%IMPDIR%%/themes/graphics/mime/image.png
-%%IMPDIR%%/themes/graphics/mime/itip.png
-%%IMPDIR%%/themes/graphics/mime/mail.png
-%%IMPDIR%%/themes/graphics/mime/text.png
-%%IMPDIR%%/themes/graphics/newmail.png
-%%IMPDIR%%/themes/graphics/reply.png
-%%IMPDIR%%/themes/graphics/shared.png
-%%IMPDIR%%/themes/graphics/signed.png
-%%IMPDIR%%/themes/graphics/spacer_red.png
-%%IMPDIR%%/themes/graphics/spellcheck.png
-%%IMPDIR%%/themes/green/screen.css
-%%IMPDIR%%/themes/grey/screen.css
-%%IMPDIR%%/themes/lavander/screen.css
-%%IMPDIR%%/themes/luc/screen.css
-%%IMPDIR%%/themes/lucblue/screen.css
-%%IMPDIR%%/themes/postnuke/screen.css
-%%IMPDIR%%/themes/screen.css
-%%IMPDIR%%/themes/simplex/screen.css
-%%IMPDIR%%/themes/sun/screen.css
-%%IMPDIR%%/thread.php
-%%IMPDIR%%/view.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%HORDE_INC%%httpd-imp.conf
-@dirrm %%IMPDIR%%/themes/sun
-@dirrm %%IMPDIR%%/themes/simplex
-@dirrm %%IMPDIR%%/themes/postnuke
-@dirrm %%IMPDIR%%/themes/lucblue
-@dirrm %%IMPDIR%%/themes/luc
-@dirrm %%IMPDIR%%/themes/lavander
-@dirrm %%IMPDIR%%/themes/graphics/mime
-@dirrm %%IMPDIR%%/themes/graphics/folders
-@dirrm %%IMPDIR%%/themes/graphics
-@dirrm %%IMPDIR%%/themes/grey
-@dirrm %%IMPDIR%%/themes/green
-@dirrm %%IMPDIR%%/themes/gennevilliers
-@dirrm %%IMPDIR%%/themes/cornflower
-@dirrm %%IMPDIR%%/themes/cherry
-@dirrm %%IMPDIR%%/themes/burntorange
-@dirrm %%IMPDIR%%/themes/brown
-@dirrm %%IMPDIR%%/themes/bluewhite
-@dirrm %%IMPDIR%%/themes/bluemoon
-@dirrm %%IMPDIR%%/themes/azur
-@dirrm %%IMPDIR%%/themes
-@dirrm %%IMPDIR%%/templates/thread
-@dirrm %%IMPDIR%%/templates/smime
-@dirrm %%IMPDIR%%/templates/search
-@dirrm %%IMPDIR%%/templates/quota
-@dirrm %%IMPDIR%%/templates/prefs
-@dirrm %%IMPDIR%%/templates/pgp
-@dirrm %%IMPDIR%%/templates/message
-@dirrm %%IMPDIR%%/templates/mailbox
-@dirrm %%IMPDIR%%/templates/login
-@dirrm %%IMPDIR%%/templates/javascript
-@dirrm %%IMPDIR%%/templates/folders
-@dirrm %%IMPDIR%%/templates/filters
-@dirrm %%IMPDIR%%/templates/fetchmail
-@dirrm %%IMPDIR%%/templates/contacts
-@dirrm %%IMPDIR%%/templates/compose
-@dirrm %%IMPDIR%%/templates/acl
-@dirrm %%IMPDIR%%/templates
-@dirrm %%IMPDIR%%/scripts
-@dirrm %%IMPDIR%%/po
-@dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_TW
-@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_CN
-@dirrm %%IMPDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/uk_UA
-@dirrm %%IMPDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/tr_TR
-@dirrm %%IMPDIR%%/locale/th_TH/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/th_TH
-@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sv_SE
-@dirrm %%IMPDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sl_SI
-@dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sk_SK
-@dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ru_RU
-@dirrm %%IMPDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ro_RO
-@dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pt_PT
-@dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pt_BR
-@dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pl_PL
-@dirrm %%IMPDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nn_NO
-@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nl_NL
-@dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nb_NO
-@dirrm %%IMPDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/mk_MK
-@dirrm %%IMPDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/lv_LV
-@dirrm %%IMPDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/lt_LT
-@dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ko_KR
-@dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ja_JP
-@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/it_IT
-@dirrm %%IMPDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/is_IS
-@dirrm %%IMPDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/id_ID
-@dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/hu_HU
-@dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/gl_ES
-@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fr_FR
-@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fi_FI
-@dirrm %%IMPDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fa_IR
-@dirrm %%IMPDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/et_EE
-@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/es_ES
-@dirrm %%IMPDIR%%/locale/en_US
-@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/de_DE
-@dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/da_DK
-@dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/cs_CZ
-@dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ca_ES
-@dirrm %%IMPDIR%%/locale/bs_BA/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/bs_BA
-@dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/bg_BG
-@dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ar_SY
-@dirrm %%IMPDIR%%/locale/ar_OM/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ar_OM
-@dirrm %%IMPDIR%%/locale
-@dirrm %%IMPDIR%%/lib/Quota
-@dirrm %%IMPDIR%%/lib/Notification/Listener
-@dirrm %%IMPDIR%%/lib/Notification
-@dirrm %%IMPDIR%%/lib/Maintenance/Task
-@dirrm %%IMPDIR%%/lib/Maintenance
-@dirrm %%IMPDIR%%/lib/MIME/Viewer
-@dirrm %%IMPDIR%%/lib/MIME
-@dirrm %%IMPDIR%%/lib/Identity
-@dirrm %%IMPDIR%%/lib/IMAP
-@dirrm %%IMPDIR%%/lib/Fetchmail
-@dirrm %%IMPDIR%%/lib/Crypt
-@dirrm %%IMPDIR%%/lib/Block
-@dirrm %%IMPDIR%%/lib/Auth
-@dirrm %%IMPDIR%%/lib
-@dirrm %%IMPDIR%%/js
-@dirrmtry %%IMPDIR%%/config
-@dirrmtry %%IMPDIR%%
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
deleted file mode 100644
index da02cc019ff6..000000000000
--- a/mail/horde-ingo/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# Ports collection makefile for:  Ingo
-# Date created:			  Dec 3, 2004
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ingo
-PORTVERSION=	1.0.2
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/ingo/				\
-		ftp://ftp.planetmirror.com/pub/horde/ingo/		\
-		ftp://ftp.au.horde.org/pub/horde/ingo/			\
-		ftp://ftp.be.horde.org/ingo/				\
-		ftp://ftp.es.horde.org/pub/ingo/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/ingo/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/ingo/	\
-		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/ingo/	\
-		http://ftp.horde.org/pub/ingo/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	Horde's email-filter management application
-
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITH_SIEVE	: if you run timsieved (with Cyrus).
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-
-NO_BUILD=	yes
-USE_PHP=	imap
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-
-PLIST_SUB=	INGODIR=${LINGODIR}  HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	INGODIR=${INGODIR}
-
-DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES docs/TODO
-CONFFILE=	backends.php fields.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LINGODIR=	${LHORDEDIR}/ingo
-PEARDIR?=	${LOCALBASE}/share/pear
-
-INGODIR=	${PREFIX}/${LINGODIR}
-CONFDIR=	${INGODIR}/config
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde
-.endif
-
-pre-configure:
-	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
-		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
-
-do-install:
-	@${MKDIR}  ${INGODIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${INGODIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo
deleted file mode 100644
index 1957b3b5ced9..000000000000
--- a/mail/horde-ingo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89
-SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29
-SIZE (ingo-h3-1.0.2.tar.gz) = 853202
diff --git a/mail/horde-ingo/files/httpd.conf.ingo b/mail/horde-ingo/files/httpd.conf.ingo
deleted file mode 100644
index d07046cdd18c..000000000000
--- a/mail/horde-ingo/files/httpd.conf.ingo
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Ingo
-#
-# For security, don't serve pages from the Ingo configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/ingo/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Ingo configuration ================
-
diff --git a/mail/horde-ingo/files/pkg-deinstall.in b/mail/horde-ingo/files/pkg-deinstall.in
deleted file mode 100644
index 2289e8963491..000000000000
--- a/mail/horde-ingo/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Ingo config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%INGODIR%%/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde-ingo/files/pkg-message.in b/mail/horde-ingo/files/pkg-message.in
deleted file mode 100644
index fba684f58b9d..000000000000
--- a/mail/horde-ingo/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-************************************************************************
-Ingo has been installed in %%INGODIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see `pkg_info -D -x horde'.
-
-Finally, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde-ingo/pkg-descr b/mail/horde-ingo/pkg-descr
deleted file mode 100644
index 382bea7a8f2d..000000000000
--- a/mail/horde-ingo/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Ingo is an email-filter management application.
-
-It is fully internationalized, integrated with Horde and the IMP Webmail
-client, and supports both server-side (Sieve, procmail) and client-side
-(IMAP) rule creation.
-
-WWW: http://horde.org/ingo/
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
deleted file mode 100644
index 85af75074930..000000000000
--- a/mail/horde-ingo/pkg-plist
+++ /dev/null
@@ -1,168 +0,0 @@
-%%HORDE_INC%%/httpd-ingo.conf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%INGODIR%%/blacklist.php
-%%INGODIR%%/config/.htaccess
-%%INGODIR%%/config/backends.php
-%%INGODIR%%/config/backends.php.dist
-%%INGODIR%%/config/conf.xml
-%%INGODIR%%/config/fields.php
-%%INGODIR%%/config/fields.php.dist
-%%INGODIR%%/config/prefs.php
-%%INGODIR%%/config/prefs.php.dist
-%%INGODIR%%/filters.php
-%%INGODIR%%/forward.php
-%%INGODIR%%/index.php
-%%INGODIR%%/lib/Driver.php
-%%INGODIR%%/lib/Driver/null.php
-%%INGODIR%%/lib/Driver/timsieved.php
-%%INGODIR%%/lib/Driver/vfs.php
-%%INGODIR%%/lib/Ingo.php
-%%INGODIR%%/lib/Script.php
-%%INGODIR%%/lib/Script/imap.php
-%%INGODIR%%/lib/Script/procmail.php
-%%INGODIR%%/lib/Script/sieve.php
-%%INGODIR%%/lib/Session.php
-%%INGODIR%%/lib/Storage.php
-%%INGODIR%%/lib/Storage/prefs.php
-%%INGODIR%%/lib/api.php
-%%INGODIR%%/lib/base.php
-%%INGODIR%%/lib/version.php
-%%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/de_DE/help.xml
-%%INGODIR%%/locale/en_US/help.xml
-%%INGODIR%%/locale/es_ES/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/es_ES/help.xml
-%%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/fi_FI/help.xml
-%%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lv_LV/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lv_LV/help.xml
-%%INGODIR%%/locale/nb_NO/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo
-%%INGODIR%%/po/README
-%%INGODIR%%/po/cs_CZ.po
-%%INGODIR%%/po/de_DE.po
-%%INGODIR%%/po/es_ES.po
-%%INGODIR%%/po/fi_FI.po
-%%INGODIR%%/po/fr_FR.po
-%%INGODIR%%/po/hu_HU.po
-%%INGODIR%%/po/ingo.pot
-%%INGODIR%%/po/it_IT.po
-%%INGODIR%%/po/ko_KR.po
-%%INGODIR%%/po/lt_LT.po
-%%INGODIR%%/po/lv_LV.po
-%%INGODIR%%/po/nb_NO.po
-%%INGODIR%%/po/nl_NL.po
-%%INGODIR%%/po/pl_PL.po
-%%INGODIR%%/po/pt_BR.po
-%%INGODIR%%/po/ro_RO.po
-%%INGODIR%%/po/sv_SE.po
-%%INGODIR%%/po/zh_TW.po
-%%INGODIR%%/rule.php
-%%INGODIR%%/script.php
-%%INGODIR%%/scripts/.htaccess
-%%INGODIR%%/scripts/convert_imp_filters.php
-%%INGODIR%%/templates/blacklist/blacklist.inc
-%%INGODIR%%/templates/common-header.inc
-%%INGODIR%%/templates/filters/filter-none.inc
-%%INGODIR%%/templates/filters/filter.html
-%%INGODIR%%/templates/filters/footer.inc
-%%INGODIR%%/templates/filters/header.inc
-%%INGODIR%%/templates/filters/settings.inc
-%%INGODIR%%/templates/forward/forward.inc
-%%INGODIR%%/templates/javascript/new_folder.js
-%%INGODIR%%/templates/menu.inc
-%%INGODIR%%/templates/rule/filter.inc
-%%INGODIR%%/templates/rule/footer.inc
-%%INGODIR%%/templates/rule/header.inc
-%%INGODIR%%/templates/script/activate.inc
-%%INGODIR%%/templates/script/footer.inc
-%%INGODIR%%/templates/script/header.inc
-%%INGODIR%%/templates/script/script.inc
-%%INGODIR%%/templates/vacation/vacation.inc
-%%INGODIR%%/templates/whitelist/whitelist.inc
-%%INGODIR%%/test.php
-%%INGODIR%%/themes/graphics/blacklist.png
-%%INGODIR%%/themes/graphics/copy.png
-%%INGODIR%%/themes/graphics/disable.png
-%%INGODIR%%/themes/graphics/enable.png
-%%INGODIR%%/themes/graphics/favicon.ico
-%%INGODIR%%/themes/graphics/forward.png
-%%INGODIR%%/themes/graphics/ingo.png
-%%INGODIR%%/themes/graphics/script.png
-%%INGODIR%%/themes/graphics/vacation.png
-%%INGODIR%%/themes/graphics/whitelist.png
-%%INGODIR%%/vacation.php
-%%INGODIR%%/whitelist.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%INGODIR%%/themes/graphics
-@dirrm %%INGODIR%%/themes
-@dirrm %%INGODIR%%/templates/whitelist
-@dirrm %%INGODIR%%/templates/vacation
-@dirrm %%INGODIR%%/templates/script
-@dirrm %%INGODIR%%/templates/rule
-@dirrm %%INGODIR%%/templates/javascript
-@dirrm %%INGODIR%%/templates/forward
-@dirrm %%INGODIR%%/templates/filters
-@dirrm %%INGODIR%%/templates/blacklist
-@dirrm %%INGODIR%%/templates
-@dirrm %%INGODIR%%/scripts
-@dirrm %%INGODIR%%/po
-@dirrm %%INGODIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/zh_TW
-@dirrm %%INGODIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/sv_SE
-@dirrm %%INGODIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/ro_RO
-@dirrm %%INGODIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/pt_BR
-@dirrm %%INGODIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/pl_PL
-@dirrm %%INGODIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/nl_NL
-@dirrm %%INGODIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/nb_NO
-@dirrm %%INGODIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/lv_LV
-@dirrm %%INGODIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/lt_LT
-@dirrm %%INGODIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/ko_KR
-@dirrm %%INGODIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/it_IT
-@dirrm %%INGODIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/hu_HU
-@dirrm %%INGODIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/fr_FR
-@dirrm %%INGODIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/fi_FI
-@dirrm %%INGODIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/es_ES
-@dirrm %%INGODIR%%/locale/en_US
-@dirrm %%INGODIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/de_DE
-@dirrm %%INGODIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/cs_CZ
-@dirrm %%INGODIR%%/locale
-@dirrm %%INGODIR%%/lib/Storage
-@dirrm %%INGODIR%%/lib/Script
-@dirrm %%INGODIR%%/lib/Driver
-@dirrm %%INGODIR%%/lib
-@dirrmtry %%INGODIR%%/config
-@dirrmtry %%INGODIR%%
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
deleted file mode 100644
index 81bfb5cbe144..000000000000
--- a/mail/horde-turba/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# Ports collection makefile for:  turba
-# Date created:			  Sat Nov 16, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	turba
-PORTVERSION=	2.0.5
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
-		ftp://ftp.planetmirror.com/pub/horde/turba/		\
-		ftp://ftp.au.horde.org/pub/horde/turba/			\
-		ftp://ftp.be.horde.org/turba/				\
-		ftp://ftp.es.horde.org/pub/turba/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/	\
-		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
-		http://ftp.horde.org/pub/turba/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	The Horde contact management application
-
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITHOUT_LDAP        : if you do not need OpenLDAP;
-#
-# - WITH_IMSP		: run IMSP cyrus-imspd.
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-
-.if !defined(WITHOUT_LDAP)
-USE_PHP=	ldap
-.endif
-
-NO_BUILD=	yes
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
-
-REINPLACE_ARGS=	-i ""
-DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
-SUB_DIRS=	config lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LTURBADIR?=	${LHORDEDIR}/turba
-
-PLIST_SUB=	TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
-
-TURBADIR=	${PREFIX}/${LTURBADIR}
-CONFDIR=	${TURBADIR}/config
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/sbin/imspd)
-WITH_IMSP=	yes
-.endif
-.if defined(WITH_IMSP)
-RUN_DEPENDS+=	imspd:${PORTSDIR}/databases/cyrus-imspd
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde
-.endif
-
-pre-configure:
-	@${RM} ${WRKSRC}/config/sources.php.dist.orig
-	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf
-	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
-		${WRKSRC}/scripts/ldap/addou.pl
-.if defined(WITH_IMSP)
-	@${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist
-.endif
-
-do-install:
-	@${MKDIR}  ${TURBADIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${TURBADIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
deleted file mode 100644
index eb17ec4654db..000000000000
--- a/mail/horde-turba/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
diff --git a/mail/horde-turba/files/httpd.conf.turba b/mail/horde-turba/files/httpd.conf.turba
deleted file mode 100644
index f6674cbb9700..000000000000
--- a/mail/horde-turba/files/httpd.conf.turba
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Turba
-#
-# For security, don't serve pages from the Turba configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/turba/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Turba configuration ================
-
diff --git a/mail/horde-turba/files/patch-config::sources.php.dist b/mail/horde-turba/files/patch-config::sources.php.dist
deleted file mode 100644
index 46b4a1ba4f5c..000000000000
--- a/mail/horde-turba/files/patch-config::sources.php.dist
+++ /dev/null
@@ -1,171 +0,0 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
--if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
--    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
--    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
--    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
--    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
--        $pass = Auth::getCredential('password');
--    }
--
--    $cfgSources['imsp'] = array(
--        'title' => _("IMSP"),
--        'type' => 'imsp',
--        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
--            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
--            'username' => $uid,
--            'password' => $pass,
--            'name' => $uid,
--            'group_id_field' => 'group',
--            'group_id_value' => 'group',
--            'contact_ownership' => false
--            ),
--        'map' => array(
--            '__key' => 'name',
--            '__type' => '__type',
--            '__members' => '__members',
--            '__owner' => '__owner',
--            '__uid' => '__uid',
--            'name' => 'fullname',
--            'email' => 'email',
--            'alias' => 'alias',
--            'company' => 'company',
--            'notes' => 'notes',
--            'workPhone' => 'phone-work',
--            'fax' => 'fax',
--            'homePhone' => 'phone-home',
--            'cellPhone' => 'cellphone',
--            'freebusyUrl' => 'freebusyUrl'
--            ),
--        'search' => array(
--            'name',
--            'email',
--            'alias',
--            'company',
--            'homePhone'
--            ),
--        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
--        );
--
--    /**
--     * Get any other address books this user might be privy to.
--     */
--    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
--    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
--            $dup = false;
--            foreach ($cfgSources as $thisSource) {
--                if (($thisSource['type'] == 'imsp') &&
--                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
--                    $dup = true;
--                }
--            }
--            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
--            }
--        }
--    } else {
--        $notification->push($result);
--    }
--}
-+//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
-+//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
-+//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
-+//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
-+//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
-+//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
-+//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
-+//UNCOMMENTIFIMSP        'title' => _("IMSP"),
-+//UNCOMMENTIFIMSP        'type' => 'imsp',
-+//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
-+//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
-+//UNCOMMENTIFIMSP            'username' => $uid,
-+//UNCOMMENTIFIMSP            'password' => $pass,
-+//UNCOMMENTIFIMSP            'name' => $uid,
-+//UNCOMMENTIFIMSP            'group_id_field' => 'group',
-+//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'map' => array(
-+//UNCOMMENTIFIMSP            '__key' => 'name',
-+//UNCOMMENTIFIMSP            '__type' => '__type',
-+//UNCOMMENTIFIMSP            '__members' => '__members',
-+//UNCOMMENTIFIMSP            '__owner' => '__owner',
-+//UNCOMMENTIFIMSP            '__uid' => '__uid',
-+//UNCOMMENTIFIMSP            'name' => 'fullname',
-+//UNCOMMENTIFIMSP            'email' => 'email',
-+//UNCOMMENTIFIMSP            'alias' => 'alias',
-+//UNCOMMENTIFIMSP            'company' => 'company',
-+//UNCOMMENTIFIMSP            'notes' => 'notes',
-+//UNCOMMENTIFIMSP            'workPhone' => 'phone-work',
-+//UNCOMMENTIFIMSP            'fax' => 'fax',
-+//UNCOMMENTIFIMSP            'homePhone' => 'phone-home',
-+//UNCOMMENTIFIMSP            'cellPhone' => 'cellphone',
-+//UNCOMMENTIFIMSP            'freebusyUrl' => 'freebusyUrl'
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'search' => array(
-+//UNCOMMENTIFIMSP            'name',
-+//UNCOMMENTIFIMSP            'email',
-+//UNCOMMENTIFIMSP            'alias',
-+//UNCOMMENTIFIMSP            'company',
-+//UNCOMMENTIFIMSP            'homePhone'
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
-+//UNCOMMENTIFIMSP        );
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    /**
-+//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
-+//UNCOMMENTIFIMSP     */
-+//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-+//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
-+//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
-+//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
-+//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
-+//UNCOMMENTIFIMSP                    $dup = true;
-+//UNCOMMENTIFIMSP                }
-+//UNCOMMENTIFIMSP            }
-+//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
-+//UNCOMMENTIFIMSP            }
-+//UNCOMMENTIFIMSP        }
-+//UNCOMMENTIFIMSP    } else {
-+//UNCOMMENTIFIMSP        $notification->push($result);
-+//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP}
- 
- /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/horde-turba/files/pkg-deinstall.in b/mail/horde-turba/files/pkg-deinstall.in
deleted file mode 100644
index afe8f9215da2..000000000000
--- a/mail/horde-turba/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Turba config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%TURBADIR%%/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde-turba/files/pkg-message.in
deleted file mode 100644
index f7347f3f3413..000000000000
--- a/mail/horde-turba/files/pkg-message.in
+++ /dev/null
@@ -1,21 +0,0 @@
-************************************************************************
-Turba has been installed in %%TURBADIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see `pkg_info -D -x horde'.
-
-Then, you might have to tune the configuration files located in
-%%CONFDIR%%/, specially the file sources.php.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
-You have to create a table in your database; please see
-%%TURBADIR%%/scripts/.
-You might create a LDAP schema: please see the doc LDAP.
-
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde-turba/pkg-descr b/mail/horde-turba/pkg-descr
deleted file mode 100644
index 7ad5e825db08..000000000000
--- a/mail/horde-turba/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Turba is the Horde contact management application. It makes heavy use
-of the Horde framework to provide integration with other applications.
-
-Turba is a fairly complete basic contact management application.
-SQL and LDAP backends are available.
-You can define the fields in your addressbooks in a very flexible way,
-just by changing the config files.
-And there are Horde API functions to add and search for contacts.
-
-WWW: http://horde.org/turba/
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
deleted file mode 100644
index 07ea12b087a2..000000000000
--- a/mail/horde-turba/pkg-plist
+++ /dev/null
@@ -1,261 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%TURBADIR%%/add.php
-%%TURBADIR%%/browse.php
-%%TURBADIR%%/config/.htaccess
-%%TURBADIR%%/config/attributes.php
-%%TURBADIR%%/config/attributes.php.dist
-%%TURBADIR%%/config/conf.xml
-%%TURBADIR%%/config/menu.php
-%%TURBADIR%%/config/menu.php.dist
-%%TURBADIR%%/config/prefs.php
-%%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/sources.php
-%%TURBADIR%%/config/sources.php.dist
-%%TURBADIR%%/data.php
-%%TURBADIR%%/delete.php
-%%TURBADIR%%/display.php
-%%TURBADIR%%/edit.php
-%%TURBADIR%%/index.php
-%%TURBADIR%%/lib/.htaccess
-%%TURBADIR%%/lib/AbstractObject.php
-%%TURBADIR%%/lib/Block/minisearch.php
-%%TURBADIR%%/lib/Driver.php
-%%TURBADIR%%/lib/Driver/imsp.php
-%%TURBADIR%%/lib/Driver/kolab.php
-%%TURBADIR%%/lib/Driver/ldap.php
-%%TURBADIR%%/lib/Driver/prefs.php
-%%TURBADIR%%/lib/Driver/sql.php
-%%TURBADIR%%/lib/Group.php
-%%TURBADIR%%/lib/List.php
-%%TURBADIR%%/lib/ListView.php
-%%TURBADIR%%/lib/Object.php
-%%TURBADIR%%/lib/ObjectView.php
-%%TURBADIR%%/lib/Renderer.php
-%%TURBADIR%%/lib/Turba.php
-%%TURBADIR%%/lib/api.php
-%%TURBADIR%%/lib/base.php
-%%TURBADIR%%/lib/prefs.php
-%%TURBADIR%%/lib/version.php
-%%TURBADIR%%/locale/.htaccess
-%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/help.xml
-%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/en_US/help.xml
-%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/es_ES/help.xml
-%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/help.xml
-%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/mk_MK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/help.xml
-%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_PT/help.xml
-%%TURBADIR%%/locale/ro_RO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/help.xml
-%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
-%%TURBADIR%%/minisearch.php
-%%TURBADIR%%/po/.htaccess
-%%TURBADIR%%/po/README
-%%TURBADIR%%/po/ar_SY.po
-%%TURBADIR%%/po/bg_BG.po
-%%TURBADIR%%/po/ca_ES.po
-%%TURBADIR%%/po/cs_CZ.po
-%%TURBADIR%%/po/da_DK.po
-%%TURBADIR%%/po/de_DE.po
-%%TURBADIR%%/po/el_GR.po
-%%TURBADIR%%/po/es_ES.po
-%%TURBADIR%%/po/et_EE.po
-%%TURBADIR%%/po/fa_IR.po
-%%TURBADIR%%/po/fi_FI.po
-%%TURBADIR%%/po/fr_FR.po
-%%TURBADIR%%/po/gl_ES.po
-%%TURBADIR%%/po/hu_HU.po
-%%TURBADIR%%/po/it_IT.po
-%%TURBADIR%%/po/ja_JP.po
-%%TURBADIR%%/po/ko_KR.po
-%%TURBADIR%%/po/lt_LT.po
-%%TURBADIR%%/po/lv_LV.po
-%%TURBADIR%%/po/mk_MK.po
-%%TURBADIR%%/po/nb_NO.po
-%%TURBADIR%%/po/nl_NL.po
-%%TURBADIR%%/po/nn_NO.po
-%%TURBADIR%%/po/pl_PL.po
-%%TURBADIR%%/po/pt_BR.po
-%%TURBADIR%%/po/pt_PT.po
-%%TURBADIR%%/po/ro_RO.po
-%%TURBADIR%%/po/ru_RU.po
-%%TURBADIR%%/po/sk_SK.po
-%%TURBADIR%%/po/sl_SI.po
-%%TURBADIR%%/po/sv_SE.po
-%%TURBADIR%%/po/tr_TR.po
-%%TURBADIR%%/po/turba.pot
-%%TURBADIR%%/po/uk_UA.po
-%%TURBADIR%%/po/zh_CN.po
-%%TURBADIR%%/po/zh_TW.po
-%%TURBADIR%%/scripts/.htaccess
-%%TURBADIR%%/scripts/Turba.reg
-%%TURBADIR%%/scripts/ldap/addou
-%%TURBADIR%%/scripts/ldap/addou.pl
-%%TURBADIR%%/scripts/ldap/core.schema.patch
-%%TURBADIR%%/scripts/ldap/rfc2739.schema
-%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
-%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
-%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
-%%TURBADIR%%/scripts/sql/turba_objects.sql
-%%TURBADIR%%/scripts/sql/turba_weddingguests.sql
-%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
-%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
-%%TURBADIR%%/search.php
-%%TURBADIR%%/templates/.htaccess
-%%TURBADIR%%/templates/block/minisearch.inc
-%%TURBADIR%%/templates/browse/actions.inc
-%%TURBADIR%%/templates/browse/column_footers.inc
-%%TURBADIR%%/templates/browse/column_headers.inc
-%%TURBADIR%%/templates/browse/contactrow.inc
-%%TURBADIR%%/templates/browse/footer.inc
-%%TURBADIR%%/templates/browse/footerAlpha.inc
-%%TURBADIR%%/templates/browse/header.inc
-%%TURBADIR%%/templates/browse/javascript.inc
-%%TURBADIR%%/templates/browse/search.inc
-%%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
-%%TURBADIR%%/templates/common-header.inc
-%%TURBADIR%%/templates/data/export.inc
-%%TURBADIR%%/templates/data/import.inc
-%%TURBADIR%%/templates/menu.inc
-%%TURBADIR%%/templates/prefs/columnselect.inc
-%%TURBADIR%%/test.php
-%%TURBADIR%%/themes/graphics/contact.png
-%%TURBADIR%%/themes/graphics/favicon.ico
-%%TURBADIR%%/themes/graphics/group.png
-%%TURBADIR%%/themes/graphics/menu/browse.png
-%%TURBADIR%%/themes/graphics/menu/new.png
-%%TURBADIR%%/themes/graphics/new.png
-%%TURBADIR%%/themes/graphics/turba.png
-%%TURBADIR%%/themes/screen.css
-%%TURBADIR%%/vcard.php
-%%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
-@dirrm %%TURBADIR%%/themes/graphics/menu
-@dirrm %%TURBADIR%%/themes/graphics
-@dirrm %%TURBADIR%%/themes
-@dirrmtry %%TURBADIR%%/config
-@dirrmtry %%TURBADIR%%
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
deleted file mode 100644
index 2420d84e6d10..000000000000
--- a/mail/horde4-imp/Makefile
+++ /dev/null
@@ -1,252 +0,0 @@
-# Ports collection makefile for:  imp3
-# Date created:			  Mon Oct 08, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	imp
-PORTVERSION=	4.0.4
-PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
-		ftp://ftp.planetmirror.com/pub/horde/imp/		\
-		ftp://ftp.au.horde.org/pub/horde/imp/			\
-		ftp://ftp.be.horde.org/imp/				\
-		ftp://ftp.es.horde.org/pub/imp/				\
-		http://ftp.horde.org/pub/imp/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	A webmail system which accesses mail over IMAP
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP	: if you do not need OpenLDAP;
-#
-# - WITHOUT_SMIME	: disable S/MIME;
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-# - WITHOUT_ASPELL	: for spelling bees...
-#
-# - WITH_ISPELL		: if you prefer ispell;
-#
-# - NOCRYPT		: if crypto is restricted in your country;
-#
-# - WITHOUT_SSL		: if you have not installed c-client WITH_SSL;
-#
-# - WITH_VALID_CERT	: if you own a valid SSL certificate;
-#
-# - WITHOUT_INGO	: if you don't need filters management;
-#
-# - WITHOUT_NAG		: if you don't want tasks management;
-#
-# - WITHOUT_TURBA	: if you do not want adressbooks;
-#
-# - WITH_HTML		: enable HTML composition mode;
-#
-# - WITHOUT_IMAPSERVER	: if your IMAP server runs on another machine;
-#
-# or you can select to work with one of these servers:
-#
-# - WITH_CYRUS-IMAPD	: IMP will work with cyrus-imapd;
-#
-# - WITH_IMAP-UW	: IMP will work with imap-uw;
-#
-# - WITH_DOVECOT	: IMP will work with dovecot;
-#
-# - WITH_COURIER-IMAP	: IMP will work with courier-imap.
-#
-# These choices are mutually exclusive, and imap-uw is the default.
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
-
-CONFLICTS=	imp-3.*
-
-USE_PHP=	imap
-.if defined(WITHOUT_TURBA)
-. if !defined(WITHOUT_LDAP)
-USE_PHP+=	ldap
-. endif
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-.else
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/turba
-.endif
-
-.if !defined(WITHOUT_INGO)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/ingo
-.endif
-
-.if !defined(WITHOUT_NAG)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/nag
-.endif
-
-.if !defined(WITHOUT_SMIME)
-USE_PHP+=	openssl
-.endif
-
-.if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
-.endif
-
-.if !defined(WITHOUT_ASPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
-.elif defined(WITH_ISPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
-.endif
-
-.if defined(WITH_HTML)
-RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-.endif
-
-NO_BUILD=	yes
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_GETTEXT=	yes
-REINPLACE_ARGS=	-i.beforeIMP
-
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES  docs/TODO  docs/UPGRADING
-CONFFILE=	filter.txt header.txt menu.php mime_drivers.php motd.php \
-		prefs.php servers.php trailer.txt
-SUB_DIRS=	config js lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LIMPDIR=	${LHORDEDIR}/imp
-PEARDIR?=	${LOCALBASE}/share/pear
-
-PLIST_SUB=	IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
-
-IMPDIR=		${PREFIX}/${LIMPDIR}
-CONFDIR=	${IMPDIR}/config
-
-HOSTNAME?=	`/bin/hostname`
-SERVOS?=	${OPSYS}-${OSREL}
-
-PORTREV_H?=	${LOCALBASE}/include/c-client/portrevision.h
-
-PATCH2RM=	prefs.php.dist.orig servers.php.dist.orig conf.xml.orig	\
-		conf.xml.beforeIMP servers.php.dist.beforeIMP
-
-.include <bsd.port.pre.mk>
-
-# I have no report about the support of dkimap4 by IMP,
-# but I shall be happy to add it if someone report success with it.
-# If an IMAP server is already installed, we just record the dependence,
-# else we shall install imap-uw.
-# IMAP servers are ordered according to my tastes, if several are
-# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
-. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+=	${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
-. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
-RUN_DEPENDS+=	${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
-. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/imap:${PORTSDIR}/mail/dovecot
-. else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-. endif
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes/
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde/
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_IMAPSERVER)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITHOUT_IMAPSERVER"
-	@${ECHO_MSG} "if you intend to run an IMAP server on an other machine."
-	@${ECHO_MSG} ""
-.endif
-
-pre-configure:
-	@${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml
-.if !defined(WITHOUT_ASPELL)
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \
-		${WRKSRC}/config/conf.xml
-.elif defined(WITH_ISPELL)
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \
-		${WRKSRC}/config/conf.xml
-.else
-	@${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml
-.endif
-.if !defined(NOCRYPT)
-	@${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \
-		${WRKSRC}/config/conf.xml
-.else
-	@${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
-.endif
-	@${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':"	\
-		${WRKSRC}/lib/MIME/Headers.php
-	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g"	\
-		${WRKSRC}/config/servers.php.dist
-.if defined(WITHOUT_SSL)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:"	\
-		${WRKSRC}/config/servers.php.dist
-.else
-	@${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
-. if defined(WITH_VALID_CERT)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
-. else
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:"	\
-		${WRKSRC}/config/servers.php.dist
-. endif
-.endif
-	@${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:"		\
-		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf
-.for fc in ${PATCH2RM}
-	@${RM} ${WRKSRC}/config/${fc}
-.endfor
-	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP
-
-pre-install:
-.if !defined(BATCH) && !defined(WITHOUT_SSL)
-	@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure c-client with SSL support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-
-do-install:
-	@${MKDIR}  ${IMPDIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${IMPDIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
deleted file mode 100644
index 22d57099697c..000000000000
--- a/mail/horde4-imp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
-SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
-SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde4-imp/files/httpd.conf.imp b/mail/horde4-imp/files/httpd.conf.imp
deleted file mode 100644
index edd7b1df357e..000000000000
--- a/mail/horde4-imp/files/httpd.conf.imp
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for IMP
-#
-# For security, don't serve pages from the IMP configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/imp/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of IMP configuration ================
-
diff --git a/mail/horde4-imp/files/patch-ab b/mail/horde4-imp/files/patch-ab
deleted file mode 100644
index 0ef811fa652d..000000000000
--- a/mail/horde4-imp/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
---- config/servers.php.dist.orig	Sun Dec 12 07:36:51 2004
-+++ config/servers.php.dist	Fri Dec 24 00:27:59 2004
-@@ -47,7 +47,7 @@
-  *
-  * folders: The folder path for the IMAP server.
-  *          Common values:
-- *            UW-IMAP               'mail/'  (note the trailing slash)
-+ *            UW-IMAP               'Mail/'  (note the trailing slash)
-  *            Cyrus, Courier-IMAP   'INBOX.' (note the trailing dot)
-  *            dovecot               ''
-  *
-@@ -174,14 +174,16 @@
- 
- $servers['imap'] = array(
-     'name' => 'IMAP Server',
--    'server' => 'imap.example.com',
-+//  'server' => 'imap.example.com',
-+    'server' => 'localhost',
-     'hordeauth' => false,
--    'protocol' => 'imap/notls',
--    'port' => 143,
--    'folders' => 'mail/',
-+    'protocol' => '%%PROTOCOL%%',
-+    'port' => %%IMAPPORT%%,
-+    'folders' => 'Mail/',
-     'namespace' => '',
-     'maildomain' => 'example.com',
--    'smtphost' => 'smtp.example.com',
-+//  'smtphost' => 'smtp.example.com',
-+    'smtphost' => 'localhost',
-     'smtpport' => 25,
-     'realm' => '',
-     'preferred' => '',
diff --git a/mail/horde4-imp/files/patch-ac b/mail/horde4-imp/files/patch-ac
deleted file mode 100644
index 68730ef6fde4..000000000000
--- a/mail/horde4-imp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig	Fri Oct 29 19:04:12 2004
-+++ config/prefs.php.dist	Thu Nov 11 21:49:05 2004
-@@ -1071,7 +1071,7 @@
- // 'value' => "source_one\tsource_two"
- // refer to turba/config/sources.php for possible source values
- $_prefs['search_sources'] = array(
--    'value' => "",
-+    'value' => 'localsql',
-     'locked' => false,
-     'shared' => false,
-     'type' => 'implicit');
diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml
deleted file mode 100644
index 225acb1a99c1..000000000000
--- a/mail/horde4-imp/files/patch-config::conf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
---- config/conf.xml.orig	Mon Nov 22 09:40:29 2004
-+++ config/conf.xml	Mon Nov 29 11:51:54 2004
-@@ -6,11 +6,11 @@
-    <configheader>External Utilities</configheader>
-    <configstring name="spellchecker" required="false" desc="Enter the location
-    of the binary to either aspell or ispell to enable the spell checker. If
--   this is empty, then spell checking will be disabled."></configstring>
-+   this is empty, then spell checking will be disabled.">%%ASPELL%%</configstring>
-    <configstring name="gnupg" required="false" desc="If you want users to have
-    the option of using the GNU Privacy Guard program to decrypt/encrypt PGP
-    files, enter the location of the 'gpg' binary here.  If this is empty this
--   feature will be disabled."></configstring>
-+   feature will be disabled.">%%GPG%%</configstring>
-    <configmultienum name="gnupg_keyserver" required="false" desc="The address of
-    the public PGP keyserver(s) to use.">wwwkeys.pgp.net
-     <values>
-@@ -23,7 +23,7 @@
-    connecting to the PGP keyserver. Timeouts are not supported on all
-    systems.">10</configstring>
-    <configstring name="openssl_cafile" required="false" desc="The location of
--   the root certificates bundle.">/somewhere/ca-bundle.crt</configstring>
-+   the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
-    <configstring name="openssl_binary" required="false" desc="The location of
-    the OpenSSL binary on your system. This program is REQUIRED to import
-    personal S/MIME certificate information, as there is no native PHP function
diff --git a/mail/horde4-imp/files/pkg-deinstall.in b/mail/horde4-imp/files/pkg-deinstall.in
deleted file mode 100644
index 13bb805c47d5..000000000000
--- a/mail/horde4-imp/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup IMP config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde4-imp/files/pkg-message.in b/mail/horde4-imp/files/pkg-message.in
deleted file mode 100644
index 78a666232a4a..000000000000
--- a/mail/horde4-imp/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-************************************************************************
-IMP has been installed in %%IMPDIR%% with your blank
-configuration files.
-
-Horde must be configured and the tables created; if not, see
-`pkg_info -D -x horde'.
-
-Then, you might have to tune the configuration files located in
-%%CONFDIR%%/, specially the file servers.php.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration. Please read %%DOCSDIR%%/INSTALL.
-
-Warning: the filter system of IMP 3.x has been replaced by a separate
-******** application => check the port mail/ingo. Ingo provides a script
-         to migrate the existing filter rules from IMP 3.x, see Ingo's
-         documentation.
-
-To protect your configuration files, you have to restart Apache.
-
-To secure your installation, it is at least recommended that you change
-the default database password used by horde and imp.
-Then, you might change the 'session.save_path' setting in php.ini to a
-directory only readable and writeable by your webserver.
-************************************************************************
diff --git a/mail/horde4-imp/pkg-descr b/mail/horde4-imp/pkg-descr
deleted file mode 100644
index b085871c38de..000000000000
--- a/mail/horde4-imp/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-IMP is the Internet Messaging Program. It is written in PHP and provides
-webmail access to IMAP and POP3 accounts.
-
-WWW: http://www.horde.org/imp/
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
deleted file mode 100644
index 5d37825d02a8..000000000000
--- a/mail/horde4-imp/pkg-plist
+++ /dev/null
@@ -1,502 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%IMPDIR%%/acl.php
-%%IMPDIR%%/attachment.php
-%%IMPDIR%%/compose.php
-%%IMPDIR%%/config/.htaccess
-%%IMPDIR%%/config/conf.xml
-%%IMPDIR%%/config/filter.txt
-%%IMPDIR%%/config/filter.txt.dist
-%%IMPDIR%%/config/header.txt
-%%IMPDIR%%/config/header.txt.dist
-%%IMPDIR%%/config/menu.php
-%%IMPDIR%%/config/menu.php.dist
-%%IMPDIR%%/config/mime_drivers.php
-%%IMPDIR%%/config/mime_drivers.php.dist
-%%IMPDIR%%/config/motd.php
-%%IMPDIR%%/config/motd.php.dist
-%%IMPDIR%%/config/prefs.php
-%%IMPDIR%%/config/prefs.php.dist
-%%IMPDIR%%/config/servers.php
-%%IMPDIR%%/config/servers.php.dist
-%%IMPDIR%%/config/trailer.txt
-%%IMPDIR%%/config/trailer.txt.dist
-%%IMPDIR%%/contacts.php
-%%IMPDIR%%/expand.php
-%%IMPDIR%%/fetchmail.php
-%%IMPDIR%%/fetchmailprefs.php
-%%IMPDIR%%/filterprefs.php
-%%IMPDIR%%/folders.php
-%%IMPDIR%%/index.php
-%%IMPDIR%%/js/ieEscGuard.js
-%%IMPDIR%%/lib/.htaccess
-%%IMPDIR%%/lib/Auth/imp.php
-%%IMPDIR%%/lib/Block/summary.php
-%%IMPDIR%%/lib/Block/tree_folders.php
-%%IMPDIR%%/lib/Compose.php
-%%IMPDIR%%/lib/Crypt/PGP.php
-%%IMPDIR%%/lib/Crypt/SMIME.php
-%%IMPDIR%%/lib/Fetchmail.php
-%%IMPDIR%%/lib/Fetchmail/imap.php
-%%IMPDIR%%/lib/Filter.php
-%%IMPDIR%%/lib/Folder.php
-%%IMPDIR%%/lib/IMAP.php
-%%IMPDIR%%/lib/IMAP/Tree.php
-%%IMPDIR%%/lib/IMP.php
-%%IMPDIR%%/lib/Identity/imp.php
-%%IMPDIR%%/lib/MIME/Contents.php
-%%IMPDIR%%/lib/MIME/Headers.php
-%%IMPDIR%%/lib/MIME/Viewer/alternative.php
-%%IMPDIR%%/lib/MIME/Viewer/appledouble.php
-%%IMPDIR%%/lib/MIME/Viewer/enriched.php
-%%IMPDIR%%/lib/MIME/Viewer/html.php
-%%IMPDIR%%/lib/MIME/Viewer/images.php
-%%IMPDIR%%/lib/MIME/Viewer/itip.php
-%%IMPDIR%%/lib/MIME/Viewer/multipart.php
-%%IMPDIR%%/lib/MIME/Viewer/notification.php
-%%IMPDIR%%/lib/MIME/Viewer/partial.php
-%%IMPDIR%%/lib/MIME/Viewer/pgp.php
-%%IMPDIR%%/lib/MIME/Viewer/pkcs7.php
-%%IMPDIR%%/lib/MIME/Viewer/plain.php
-%%IMPDIR%%/lib/MIME/Viewer/related.php
-%%IMPDIR%%/lib/MIME/Viewer/rfc822.php
-%%IMPDIR%%/lib/MIME/Viewer/status.php
-%%IMPDIR%%/lib/MIME/Viewer/tnef.php
-%%IMPDIR%%/lib/MIME/Viewer/zip.php
-%%IMPDIR%%/lib/Mailbox.php
-%%IMPDIR%%/lib/Maillog.php
-%%IMPDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/fetchmail_login.php
-%%IMPDIR%%/lib/Maintenance/Task/purge_trash.php
-%%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/tos_agreement.php
-%%IMPDIR%%/lib/Maintenance/imp.php
-%%IMPDIR%%/lib/Message.php
-%%IMPDIR%%/lib/Notification/Listener/status.php
-%%IMPDIR%%/lib/Quota.php
-%%IMPDIR%%/lib/Quota/command.php
-%%IMPDIR%%/lib/Quota/courier.php
-%%IMPDIR%%/lib/Quota/cyrus.php
-%%IMPDIR%%/lib/Quota/logfile.php
-%%IMPDIR%%/lib/Quota/mdaemon.php
-%%IMPDIR%%/lib/Quota/mercury32.php
-%%IMPDIR%%/lib/Search.php
-%%IMPDIR%%/lib/Session.php
-%%IMPDIR%%/lib/Spam.php
-%%IMPDIR%%/lib/VFolder.php
-%%IMPDIR%%/lib/api.php
-%%IMPDIR%%/lib/base.php
-%%IMPDIR%%/lib/prefs.php
-%%IMPDIR%%/lib/version.php
-%%IMPDIR%%/locale/.htaccess
-%%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ca_ES/help.xml
-%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/cs_CZ/help.xml
-%%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/da_DK/help.xml
-%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/de_DE/help.xml
-%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/el_GR/help.xml
-%%IMPDIR%%/locale/en_US/help.xml
-%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/es_ES/help.xml
-%%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/et_EE/help.xml
-%%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fa_IR/help.xml
-%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fi_FI/help.xml
-%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fr_FR/help.xml
-%%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/hu_HU/help.xml
-%%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/is_IS/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/it_IT/help.xml
-%%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ko_KR/help.xml
-%%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nb_NO/help.xml
-%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nl_NL/help.xml
-%%IMPDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pl_PL/help.xml
-%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pt_BR/help.xml
-%%IMPDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pt_PT/help.xml
-%%IMPDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ru_RU/help.xml
-%%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sk_SK/help.xml
-%%IMPDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sv_SE/help.xml
-%%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/uk_UA/help.xml
-%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_CN/help.xml
-%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_TW/help.xml
-%%IMPDIR%%/login.php
-%%IMPDIR%%/mailbox.php
-%%IMPDIR%%/message.php
-%%IMPDIR%%/pgp.php
-%%IMPDIR%%/po/.htaccess
-%%IMPDIR%%/po/README
-%%IMPDIR%%/po/ar_OM.po
-%%IMPDIR%%/po/ar_SY.po
-%%IMPDIR%%/po/bg_BG.po
-%%IMPDIR%%/po/bs_BA.po
-%%IMPDIR%%/po/ca_ES.po
-%%IMPDIR%%/po/cs_CZ.po
-%%IMPDIR%%/po/da_DK.po
-%%IMPDIR%%/po/de_DE.po
-%%IMPDIR%%/po/el_GR.po
-%%IMPDIR%%/po/es_ES.po
-%%IMPDIR%%/po/et_EE.po
-%%IMPDIR%%/po/fa_IR.po
-%%IMPDIR%%/po/fi_FI.po
-%%IMPDIR%%/po/fr_FR.po
-%%IMPDIR%%/po/gl_ES.po
-%%IMPDIR%%/po/hu_HU.po
-%%IMPDIR%%/po/id_ID.po
-%%IMPDIR%%/po/imp.pot
-%%IMPDIR%%/po/is_IS.po
-%%IMPDIR%%/po/it_IT.po
-%%IMPDIR%%/po/ja_JP.po
-%%IMPDIR%%/po/ko_KR.po
-%%IMPDIR%%/po/lt_LT.po
-%%IMPDIR%%/po/lv_LV.po
-%%IMPDIR%%/po/mk_MK.po
-%%IMPDIR%%/po/nb_NO.po
-%%IMPDIR%%/po/nl_NL.po
-%%IMPDIR%%/po/nn_NO.po
-%%IMPDIR%%/po/pl_PL.po
-%%IMPDIR%%/po/pt_BR.po
-%%IMPDIR%%/po/pt_PT.po
-%%IMPDIR%%/po/ro_RO.po
-%%IMPDIR%%/po/ru_RU.po
-%%IMPDIR%%/po/sk_SK.po
-%%IMPDIR%%/po/sl_SI.po
-%%IMPDIR%%/po/sv_SE.po
-%%IMPDIR%%/po/th_TH.po
-%%IMPDIR%%/po/tr_TR.po
-%%IMPDIR%%/po/uk_UA.po
-%%IMPDIR%%/po/zh_CN.po
-%%IMPDIR%%/po/zh_TW.po
-%%IMPDIR%%/recompose.php
-%%IMPDIR%%/redirect.php
-%%IMPDIR%%/scripts/.htaccess
-%%IMPDIR%%/scripts/Imp.reg
-%%IMPDIR%%/scripts/custom_login.php
-%%IMPDIR%%/scripts/singlescript.php
-%%IMPDIR%%/search.php
-%%IMPDIR%%/smime.php
-%%IMPDIR%%/spelling.php
-%%IMPDIR%%/templates/.htaccess
-%%IMPDIR%%/templates/acl/acl.inc
-%%IMPDIR%%/templates/common-header.inc
-%%IMPDIR%%/templates/compose/attachments.inc
-%%IMPDIR%%/templates/compose/attachments.js
-%%IMPDIR%%/templates/compose/compose.inc
-%%IMPDIR%%/templates/compose/compose.js
-%%IMPDIR%%/templates/compose/compose_expand.js
-%%IMPDIR%%/templates/compose/encrypt_list.inc
-%%IMPDIR%%/templates/compose/expand.inc
-%%IMPDIR%%/templates/compose/recompose.inc
-%%IMPDIR%%/templates/compose/redirect.inc
-%%IMPDIR%%/templates/compose/spelling.inc
-%%IMPDIR%%/templates/compose/spelling.js
-%%IMPDIR%%/templates/compose/success.inc
-%%IMPDIR%%/templates/contacts/contacts.inc
-%%IMPDIR%%/templates/fetchmail/account_select.inc
-%%IMPDIR%%/templates/fetchmail/driver_select.inc
-%%IMPDIR%%/templates/fetchmail/fetchmail.inc
-%%IMPDIR%%/templates/fetchmail/manage.inc
-%%IMPDIR%%/templates/fetchmail/top.inc
-%%IMPDIR%%/templates/filters/notactive.inc
-%%IMPDIR%%/templates/filters/prefs.inc
-%%IMPDIR%%/templates/folders/actions.inc
-%%IMPDIR%%/templates/folders/folders.html
-%%IMPDIR%%/templates/folders/folders_confirm.html
-%%IMPDIR%%/templates/folders/foot.inc
-%%IMPDIR%%/templates/folders/head.inc
-%%IMPDIR%%/templates/folders/import.inc
-%%IMPDIR%%/templates/folders/javascript.inc
-%%IMPDIR%%/templates/javascript/open_compose_win.js
-%%IMPDIR%%/templates/javascript/open_print_win.js
-%%IMPDIR%%/templates/login/login.inc
-%%IMPDIR%%/templates/mailbox/actions.inc
-%%IMPDIR%%/templates/mailbox/actions_deleted.inc
-%%IMPDIR%%/templates/mailbox/alert.inc
-%%IMPDIR%%/templates/mailbox/empty_mailbox.inc
-%%IMPDIR%%/templates/mailbox/footer.inc
-%%IMPDIR%%/templates/mailbox/header.inc
-%%IMPDIR%%/templates/mailbox/javascript.inc
-%%IMPDIR%%/templates/mailbox/legend.inc
-%%IMPDIR%%/templates/mailbox/mailbox.html
-%%IMPDIR%%/templates/mailbox/message_footers.inc
-%%IMPDIR%%/templates/mailbox/message_headers.inc
-%%IMPDIR%%/templates/mailbox/navbar.inc
-%%IMPDIR%%/templates/mailbox/searchfolder.inc
-%%IMPDIR%%/templates/menu.inc
-%%IMPDIR%%/templates/message/headers.inc
-%%IMPDIR%%/templates/message/javascript.inc
-%%IMPDIR%%/templates/message/message.inc
-%%IMPDIR%%/templates/message/navbar_actions.inc
-%%IMPDIR%%/templates/message/navbar_navigate.inc
-%%IMPDIR%%/templates/message/navbar_top.inc
-%%IMPDIR%%/templates/pgp/import_key.inc
-%%IMPDIR%%/templates/pgp/notactive.inc
-%%IMPDIR%%/templates/pgp/open_pgp_import.js
-%%IMPDIR%%/templates/pgp/open_pgp_win.js
-%%IMPDIR%%/templates/pgp/passphrase.inc
-%%IMPDIR%%/templates/pgp/pgp.inc
-%%IMPDIR%%/templates/prefs/encryptselect.inc
-%%IMPDIR%%/templates/prefs/folderselect.inc
-%%IMPDIR%%/templates/prefs/initialpageselect.inc
-%%IMPDIR%%/templates/prefs/sentmailselect.inc
-%%IMPDIR%%/templates/prefs/sourceselect.inc
-%%IMPDIR%%/templates/prefs/spamselect.inc
-%%IMPDIR%%/templates/prefs/trashselect.inc
-%%IMPDIR%%/templates/quota/quota.inc
-%%IMPDIR%%/templates/search/fields.inc
-%%IMPDIR%%/templates/search/header.inc
-%%IMPDIR%%/templates/search/javascript.inc
-%%IMPDIR%%/templates/search/main.inc
-%%IMPDIR%%/templates/smime/import_key.inc
-%%IMPDIR%%/templates/smime/notactive.inc
-%%IMPDIR%%/templates/smime/open_smime_import.js
-%%IMPDIR%%/templates/smime/open_smime_win.js
-%%IMPDIR%%/templates/smime/passphrase.inc
-%%IMPDIR%%/templates/smime/smime.inc
-%%IMPDIR%%/templates/thread/bottom.inc
-%%IMPDIR%%/templates/thread/thread.html
-%%IMPDIR%%/templates/thread/top.inc
-%%IMPDIR%%/test.php
-%%IMPDIR%%/themes/azur/screen.css
-%%IMPDIR%%/themes/bluemoon/screen.css
-%%IMPDIR%%/themes/bluewhite/screen.css
-%%IMPDIR%%/themes/brown/screen.css
-%%IMPDIR%%/themes/burntorange/screen.css
-%%IMPDIR%%/themes/cherry/screen.css
-%%IMPDIR%%/themes/cornflower/screen.css
-%%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/graphics/addressbook-blue.png
-%%IMPDIR%%/themes/graphics/addressbook-red.png
-%%IMPDIR%%/themes/graphics/apple.png
-%%IMPDIR%%/themes/graphics/attachment.png
-%%IMPDIR%%/themes/graphics/compose.png
-%%IMPDIR%%/themes/graphics/empty_trash.png
-%%IMPDIR%%/themes/graphics/encrypted.png
-%%IMPDIR%%/themes/graphics/expand.png
-%%IMPDIR%%/themes/graphics/favicon.ico
-%%IMPDIR%%/themes/graphics/fetchmail.png
-%%IMPDIR%%/themes/graphics/filters.png
-%%IMPDIR%%/themes/graphics/folders/drafts.png
-%%IMPDIR%%/themes/graphics/folders/folder.png
-%%IMPDIR%%/themes/graphics/folders/folder_open.png
-%%IMPDIR%%/themes/graphics/folders/inbox.png
-%%IMPDIR%%/themes/graphics/folders/sent.png
-%%IMPDIR%%/themes/graphics/folders/templates.png
-%%IMPDIR%%/themes/graphics/folders/trash.png
-%%IMPDIR%%/themes/graphics/forward.png
-%%IMPDIR%%/themes/graphics/imp.png
-%%IMPDIR%%/themes/graphics/mail_answered.png
-%%IMPDIR%%/themes/graphics/mail_deleted.png
-%%IMPDIR%%/themes/graphics/mail_draft.png
-%%IMPDIR%%/themes/graphics/mail_flagged.png
-%%IMPDIR%%/themes/graphics/mail_personal.png
-%%IMPDIR%%/themes/graphics/mail_priority_high.png
-%%IMPDIR%%/themes/graphics/mail_priority_low.png
-%%IMPDIR%%/themes/graphics/mail_unseen.png
-%%IMPDIR%%/themes/graphics/manage_attachments.png
-%%IMPDIR%%/themes/graphics/mime/binary.png
-%%IMPDIR%%/themes/graphics/mime/compressed.png
-%%IMPDIR%%/themes/graphics/mime/encryption.png
-%%IMPDIR%%/themes/graphics/mime/html.png
-%%IMPDIR%%/themes/graphics/mime/image.png
-%%IMPDIR%%/themes/graphics/mime/itip.png
-%%IMPDIR%%/themes/graphics/mime/mail.png
-%%IMPDIR%%/themes/graphics/mime/text.png
-%%IMPDIR%%/themes/graphics/newmail.png
-%%IMPDIR%%/themes/graphics/reply.png
-%%IMPDIR%%/themes/graphics/shared.png
-%%IMPDIR%%/themes/graphics/signed.png
-%%IMPDIR%%/themes/graphics/spacer_red.png
-%%IMPDIR%%/themes/graphics/spellcheck.png
-%%IMPDIR%%/themes/green/screen.css
-%%IMPDIR%%/themes/grey/screen.css
-%%IMPDIR%%/themes/lavander/screen.css
-%%IMPDIR%%/themes/luc/screen.css
-%%IMPDIR%%/themes/lucblue/screen.css
-%%IMPDIR%%/themes/postnuke/screen.css
-%%IMPDIR%%/themes/screen.css
-%%IMPDIR%%/themes/simplex/screen.css
-%%IMPDIR%%/themes/sun/screen.css
-%%IMPDIR%%/thread.php
-%%IMPDIR%%/view.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%HORDE_INC%%httpd-imp.conf
-@dirrm %%IMPDIR%%/themes/sun
-@dirrm %%IMPDIR%%/themes/simplex
-@dirrm %%IMPDIR%%/themes/postnuke
-@dirrm %%IMPDIR%%/themes/lucblue
-@dirrm %%IMPDIR%%/themes/luc
-@dirrm %%IMPDIR%%/themes/lavander
-@dirrm %%IMPDIR%%/themes/graphics/mime
-@dirrm %%IMPDIR%%/themes/graphics/folders
-@dirrm %%IMPDIR%%/themes/graphics
-@dirrm %%IMPDIR%%/themes/grey
-@dirrm %%IMPDIR%%/themes/green
-@dirrm %%IMPDIR%%/themes/gennevilliers
-@dirrm %%IMPDIR%%/themes/cornflower
-@dirrm %%IMPDIR%%/themes/cherry
-@dirrm %%IMPDIR%%/themes/burntorange
-@dirrm %%IMPDIR%%/themes/brown
-@dirrm %%IMPDIR%%/themes/bluewhite
-@dirrm %%IMPDIR%%/themes/bluemoon
-@dirrm %%IMPDIR%%/themes/azur
-@dirrm %%IMPDIR%%/themes
-@dirrm %%IMPDIR%%/templates/thread
-@dirrm %%IMPDIR%%/templates/smime
-@dirrm %%IMPDIR%%/templates/search
-@dirrm %%IMPDIR%%/templates/quota
-@dirrm %%IMPDIR%%/templates/prefs
-@dirrm %%IMPDIR%%/templates/pgp
-@dirrm %%IMPDIR%%/templates/message
-@dirrm %%IMPDIR%%/templates/mailbox
-@dirrm %%IMPDIR%%/templates/login
-@dirrm %%IMPDIR%%/templates/javascript
-@dirrm %%IMPDIR%%/templates/folders
-@dirrm %%IMPDIR%%/templates/filters
-@dirrm %%IMPDIR%%/templates/fetchmail
-@dirrm %%IMPDIR%%/templates/contacts
-@dirrm %%IMPDIR%%/templates/compose
-@dirrm %%IMPDIR%%/templates/acl
-@dirrm %%IMPDIR%%/templates
-@dirrm %%IMPDIR%%/scripts
-@dirrm %%IMPDIR%%/po
-@dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_TW
-@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_CN
-@dirrm %%IMPDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/uk_UA
-@dirrm %%IMPDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/tr_TR
-@dirrm %%IMPDIR%%/locale/th_TH/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/th_TH
-@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sv_SE
-@dirrm %%IMPDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sl_SI
-@dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sk_SK
-@dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ru_RU
-@dirrm %%IMPDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ro_RO
-@dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pt_PT
-@dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pt_BR
-@dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pl_PL
-@dirrm %%IMPDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nn_NO
-@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nl_NL
-@dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nb_NO
-@dirrm %%IMPDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/mk_MK
-@dirrm %%IMPDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/lv_LV
-@dirrm %%IMPDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/lt_LT
-@dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ko_KR
-@dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ja_JP
-@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/it_IT
-@dirrm %%IMPDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/is_IS
-@dirrm %%IMPDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/id_ID
-@dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/hu_HU
-@dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/gl_ES
-@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fr_FR
-@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fi_FI
-@dirrm %%IMPDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fa_IR
-@dirrm %%IMPDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/et_EE
-@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/es_ES
-@dirrm %%IMPDIR%%/locale/en_US
-@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/de_DE
-@dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/da_DK
-@dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/cs_CZ
-@dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ca_ES
-@dirrm %%IMPDIR%%/locale/bs_BA/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/bs_BA
-@dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/bg_BG
-@dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ar_SY
-@dirrm %%IMPDIR%%/locale/ar_OM/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ar_OM
-@dirrm %%IMPDIR%%/locale
-@dirrm %%IMPDIR%%/lib/Quota
-@dirrm %%IMPDIR%%/lib/Notification/Listener
-@dirrm %%IMPDIR%%/lib/Notification
-@dirrm %%IMPDIR%%/lib/Maintenance/Task
-@dirrm %%IMPDIR%%/lib/Maintenance
-@dirrm %%IMPDIR%%/lib/MIME/Viewer
-@dirrm %%IMPDIR%%/lib/MIME
-@dirrm %%IMPDIR%%/lib/Identity
-@dirrm %%IMPDIR%%/lib/IMAP
-@dirrm %%IMPDIR%%/lib/Fetchmail
-@dirrm %%IMPDIR%%/lib/Crypt
-@dirrm %%IMPDIR%%/lib/Block
-@dirrm %%IMPDIR%%/lib/Auth
-@dirrm %%IMPDIR%%/lib
-@dirrm %%IMPDIR%%/js
-@dirrmtry %%IMPDIR%%/config
-@dirrmtry %%IMPDIR%%
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
deleted file mode 100644
index da02cc019ff6..000000000000
--- a/mail/horde4-ingo/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# Ports collection makefile for:  Ingo
-# Date created:			  Dec 3, 2004
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ingo
-PORTVERSION=	1.0.2
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/ingo/				\
-		ftp://ftp.planetmirror.com/pub/horde/ingo/		\
-		ftp://ftp.au.horde.org/pub/horde/ingo/			\
-		ftp://ftp.be.horde.org/ingo/				\
-		ftp://ftp.es.horde.org/pub/ingo/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/ingo/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/ingo/	\
-		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/ingo/	\
-		http://ftp.horde.org/pub/ingo/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	Horde's email-filter management application
-
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITH_SIEVE	: if you run timsieved (with Cyrus).
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-
-NO_BUILD=	yes
-USE_PHP=	imap
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-
-PLIST_SUB=	INGODIR=${LINGODIR}  HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	INGODIR=${INGODIR}
-
-DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES docs/TODO
-CONFFILE=	backends.php fields.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LINGODIR=	${LHORDEDIR}/ingo
-PEARDIR?=	${LOCALBASE}/share/pear
-
-INGODIR=	${PREFIX}/${LINGODIR}
-CONFDIR=	${INGODIR}/config
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde
-.endif
-
-pre-configure:
-	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
-		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
-
-do-install:
-	@${MKDIR}  ${INGODIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${INGODIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
deleted file mode 100644
index 1957b3b5ced9..000000000000
--- a/mail/horde4-ingo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89
-SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29
-SIZE (ingo-h3-1.0.2.tar.gz) = 853202
diff --git a/mail/horde4-ingo/files/httpd.conf.ingo b/mail/horde4-ingo/files/httpd.conf.ingo
deleted file mode 100644
index d07046cdd18c..000000000000
--- a/mail/horde4-ingo/files/httpd.conf.ingo
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Ingo
-#
-# For security, don't serve pages from the Ingo configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/ingo/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Ingo configuration ================
-
diff --git a/mail/horde4-ingo/files/pkg-deinstall.in b/mail/horde4-ingo/files/pkg-deinstall.in
deleted file mode 100644
index 2289e8963491..000000000000
--- a/mail/horde4-ingo/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Ingo config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%INGODIR%%/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde4-ingo/files/pkg-message.in b/mail/horde4-ingo/files/pkg-message.in
deleted file mode 100644
index fba684f58b9d..000000000000
--- a/mail/horde4-ingo/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-************************************************************************
-Ingo has been installed in %%INGODIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see `pkg_info -D -x horde'.
-
-Finally, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde4-ingo/pkg-descr b/mail/horde4-ingo/pkg-descr
deleted file mode 100644
index 382bea7a8f2d..000000000000
--- a/mail/horde4-ingo/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Ingo is an email-filter management application.
-
-It is fully internationalized, integrated with Horde and the IMP Webmail
-client, and supports both server-side (Sieve, procmail) and client-side
-(IMAP) rule creation.
-
-WWW: http://horde.org/ingo/
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
deleted file mode 100644
index 85af75074930..000000000000
--- a/mail/horde4-ingo/pkg-plist
+++ /dev/null
@@ -1,168 +0,0 @@
-%%HORDE_INC%%/httpd-ingo.conf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%INGODIR%%/blacklist.php
-%%INGODIR%%/config/.htaccess
-%%INGODIR%%/config/backends.php
-%%INGODIR%%/config/backends.php.dist
-%%INGODIR%%/config/conf.xml
-%%INGODIR%%/config/fields.php
-%%INGODIR%%/config/fields.php.dist
-%%INGODIR%%/config/prefs.php
-%%INGODIR%%/config/prefs.php.dist
-%%INGODIR%%/filters.php
-%%INGODIR%%/forward.php
-%%INGODIR%%/index.php
-%%INGODIR%%/lib/Driver.php
-%%INGODIR%%/lib/Driver/null.php
-%%INGODIR%%/lib/Driver/timsieved.php
-%%INGODIR%%/lib/Driver/vfs.php
-%%INGODIR%%/lib/Ingo.php
-%%INGODIR%%/lib/Script.php
-%%INGODIR%%/lib/Script/imap.php
-%%INGODIR%%/lib/Script/procmail.php
-%%INGODIR%%/lib/Script/sieve.php
-%%INGODIR%%/lib/Session.php
-%%INGODIR%%/lib/Storage.php
-%%INGODIR%%/lib/Storage/prefs.php
-%%INGODIR%%/lib/api.php
-%%INGODIR%%/lib/base.php
-%%INGODIR%%/lib/version.php
-%%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/de_DE/help.xml
-%%INGODIR%%/locale/en_US/help.xml
-%%INGODIR%%/locale/es_ES/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/es_ES/help.xml
-%%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/fi_FI/help.xml
-%%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lv_LV/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/lv_LV/help.xml
-%%INGODIR%%/locale/nb_NO/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
-%%INGODIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo
-%%INGODIR%%/po/README
-%%INGODIR%%/po/cs_CZ.po
-%%INGODIR%%/po/de_DE.po
-%%INGODIR%%/po/es_ES.po
-%%INGODIR%%/po/fi_FI.po
-%%INGODIR%%/po/fr_FR.po
-%%INGODIR%%/po/hu_HU.po
-%%INGODIR%%/po/ingo.pot
-%%INGODIR%%/po/it_IT.po
-%%INGODIR%%/po/ko_KR.po
-%%INGODIR%%/po/lt_LT.po
-%%INGODIR%%/po/lv_LV.po
-%%INGODIR%%/po/nb_NO.po
-%%INGODIR%%/po/nl_NL.po
-%%INGODIR%%/po/pl_PL.po
-%%INGODIR%%/po/pt_BR.po
-%%INGODIR%%/po/ro_RO.po
-%%INGODIR%%/po/sv_SE.po
-%%INGODIR%%/po/zh_TW.po
-%%INGODIR%%/rule.php
-%%INGODIR%%/script.php
-%%INGODIR%%/scripts/.htaccess
-%%INGODIR%%/scripts/convert_imp_filters.php
-%%INGODIR%%/templates/blacklist/blacklist.inc
-%%INGODIR%%/templates/common-header.inc
-%%INGODIR%%/templates/filters/filter-none.inc
-%%INGODIR%%/templates/filters/filter.html
-%%INGODIR%%/templates/filters/footer.inc
-%%INGODIR%%/templates/filters/header.inc
-%%INGODIR%%/templates/filters/settings.inc
-%%INGODIR%%/templates/forward/forward.inc
-%%INGODIR%%/templates/javascript/new_folder.js
-%%INGODIR%%/templates/menu.inc
-%%INGODIR%%/templates/rule/filter.inc
-%%INGODIR%%/templates/rule/footer.inc
-%%INGODIR%%/templates/rule/header.inc
-%%INGODIR%%/templates/script/activate.inc
-%%INGODIR%%/templates/script/footer.inc
-%%INGODIR%%/templates/script/header.inc
-%%INGODIR%%/templates/script/script.inc
-%%INGODIR%%/templates/vacation/vacation.inc
-%%INGODIR%%/templates/whitelist/whitelist.inc
-%%INGODIR%%/test.php
-%%INGODIR%%/themes/graphics/blacklist.png
-%%INGODIR%%/themes/graphics/copy.png
-%%INGODIR%%/themes/graphics/disable.png
-%%INGODIR%%/themes/graphics/enable.png
-%%INGODIR%%/themes/graphics/favicon.ico
-%%INGODIR%%/themes/graphics/forward.png
-%%INGODIR%%/themes/graphics/ingo.png
-%%INGODIR%%/themes/graphics/script.png
-%%INGODIR%%/themes/graphics/vacation.png
-%%INGODIR%%/themes/graphics/whitelist.png
-%%INGODIR%%/vacation.php
-%%INGODIR%%/whitelist.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%INGODIR%%/themes/graphics
-@dirrm %%INGODIR%%/themes
-@dirrm %%INGODIR%%/templates/whitelist
-@dirrm %%INGODIR%%/templates/vacation
-@dirrm %%INGODIR%%/templates/script
-@dirrm %%INGODIR%%/templates/rule
-@dirrm %%INGODIR%%/templates/javascript
-@dirrm %%INGODIR%%/templates/forward
-@dirrm %%INGODIR%%/templates/filters
-@dirrm %%INGODIR%%/templates/blacklist
-@dirrm %%INGODIR%%/templates
-@dirrm %%INGODIR%%/scripts
-@dirrm %%INGODIR%%/po
-@dirrm %%INGODIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/zh_TW
-@dirrm %%INGODIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/sv_SE
-@dirrm %%INGODIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/ro_RO
-@dirrm %%INGODIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/pt_BR
-@dirrm %%INGODIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/pl_PL
-@dirrm %%INGODIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/nl_NL
-@dirrm %%INGODIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/nb_NO
-@dirrm %%INGODIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/lv_LV
-@dirrm %%INGODIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/lt_LT
-@dirrm %%INGODIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/ko_KR
-@dirrm %%INGODIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/it_IT
-@dirrm %%INGODIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/hu_HU
-@dirrm %%INGODIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/fr_FR
-@dirrm %%INGODIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/fi_FI
-@dirrm %%INGODIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/es_ES
-@dirrm %%INGODIR%%/locale/en_US
-@dirrm %%INGODIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/de_DE
-@dirrm %%INGODIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%INGODIR%%/locale/cs_CZ
-@dirrm %%INGODIR%%/locale
-@dirrm %%INGODIR%%/lib/Storage
-@dirrm %%INGODIR%%/lib/Script
-@dirrm %%INGODIR%%/lib/Driver
-@dirrm %%INGODIR%%/lib
-@dirrmtry %%INGODIR%%/config
-@dirrmtry %%INGODIR%%
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
deleted file mode 100644
index 81bfb5cbe144..000000000000
--- a/mail/horde4-turba/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# Ports collection makefile for:  turba
-# Date created:			  Sat Nov 16, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	turba
-PORTVERSION=	2.0.5
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
-		ftp://ftp.planetmirror.com/pub/horde/turba/		\
-		ftp://ftp.au.horde.org/pub/horde/turba/			\
-		ftp://ftp.be.horde.org/turba/				\
-		ftp://ftp.es.horde.org/pub/turba/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/	\
-		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
-		http://ftp.horde.org/pub/turba/
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	The Horde contact management application
-
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITHOUT_LDAP        : if you do not need OpenLDAP;
-#
-# - WITH_IMSP		: run IMSP cyrus-imspd.
-#
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
-
-.if !defined(WITHOUT_LDAP)
-USE_PHP=	ldap
-.endif
-
-NO_BUILD=	yes
-USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
-
-REINPLACE_ARGS=	-i ""
-DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
-SUB_DIRS=	config lib locale po scripts templates themes
-
-LHORDEDIR?=	www/horde
-LTURBADIR?=	${LHORDEDIR}/turba
-
-PLIST_SUB=	TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
-
-TURBADIR=	${PREFIX}/${LTURBADIR}
-CONFDIR=	${TURBADIR}/config
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/sbin/imspd)
-WITH_IMSP=	yes
-.endif
-.if defined(WITH_IMSP)
-RUN_DEPENDS+=	imspd:${PORTSDIR}/databases/cyrus-imspd
-.endif
-
-.if ${APACHE_VERSION} >= 20
-HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
-.else
-HORDE_INC=	${LOCALBASE}/etc/horde
-.endif
-
-pre-configure:
-	@${RM} ${WRKSRC}/config/sources.php.dist.orig
-	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf
-	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
-		${WRKSRC}/scripts/ldap/addou.pl
-.if defined(WITH_IMSP)
-	@${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist
-.endif
-
-do-install:
-	@${MKDIR}  ${TURBADIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${TURBADIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
deleted file mode 100644
index eb17ec4654db..000000000000
--- a/mail/horde4-turba/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
diff --git a/mail/horde4-turba/files/httpd.conf.turba b/mail/horde4-turba/files/httpd.conf.turba
deleted file mode 100644
index f6674cbb9700..000000000000
--- a/mail/horde4-turba/files/httpd.conf.turba
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Turba
-#
-# For security, don't serve pages from the Turba configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/turba/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Turba configuration ================
-
diff --git a/mail/horde4-turba/files/patch-config::sources.php.dist b/mail/horde4-turba/files/patch-config::sources.php.dist
deleted file mode 100644
index 46b4a1ba4f5c..000000000000
--- a/mail/horde4-turba/files/patch-config::sources.php.dist
+++ /dev/null
@@ -1,171 +0,0 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
--if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
--    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
--    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
--    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
--    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
--        $pass = Auth::getCredential('password');
--    }
--
--    $cfgSources['imsp'] = array(
--        'title' => _("IMSP"),
--        'type' => 'imsp',
--        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
--            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
--            'username' => $uid,
--            'password' => $pass,
--            'name' => $uid,
--            'group_id_field' => 'group',
--            'group_id_value' => 'group',
--            'contact_ownership' => false
--            ),
--        'map' => array(
--            '__key' => 'name',
--            '__type' => '__type',
--            '__members' => '__members',
--            '__owner' => '__owner',
--            '__uid' => '__uid',
--            'name' => 'fullname',
--            'email' => 'email',
--            'alias' => 'alias',
--            'company' => 'company',
--            'notes' => 'notes',
--            'workPhone' => 'phone-work',
--            'fax' => 'fax',
--            'homePhone' => 'phone-home',
--            'cellPhone' => 'cellphone',
--            'freebusyUrl' => 'freebusyUrl'
--            ),
--        'search' => array(
--            'name',
--            'email',
--            'alias',
--            'company',
--            'homePhone'
--            ),
--        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
--        );
--
--    /**
--     * Get any other address books this user might be privy to.
--     */
--    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
--    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
--            $dup = false;
--            foreach ($cfgSources as $thisSource) {
--                if (($thisSource['type'] == 'imsp') &&
--                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
--                    $dup = true;
--                }
--            }
--            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
--            }
--        }
--    } else {
--        $notification->push($result);
--    }
--}
-+//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
-+//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
-+//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
-+//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
-+//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
-+//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
-+//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
-+//UNCOMMENTIFIMSP        'title' => _("IMSP"),
-+//UNCOMMENTIFIMSP        'type' => 'imsp',
-+//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
-+//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
-+//UNCOMMENTIFIMSP            'username' => $uid,
-+//UNCOMMENTIFIMSP            'password' => $pass,
-+//UNCOMMENTIFIMSP            'name' => $uid,
-+//UNCOMMENTIFIMSP            'group_id_field' => 'group',
-+//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'map' => array(
-+//UNCOMMENTIFIMSP            '__key' => 'name',
-+//UNCOMMENTIFIMSP            '__type' => '__type',
-+//UNCOMMENTIFIMSP            '__members' => '__members',
-+//UNCOMMENTIFIMSP            '__owner' => '__owner',
-+//UNCOMMENTIFIMSP            '__uid' => '__uid',
-+//UNCOMMENTIFIMSP            'name' => 'fullname',
-+//UNCOMMENTIFIMSP            'email' => 'email',
-+//UNCOMMENTIFIMSP            'alias' => 'alias',
-+//UNCOMMENTIFIMSP            'company' => 'company',
-+//UNCOMMENTIFIMSP            'notes' => 'notes',
-+//UNCOMMENTIFIMSP            'workPhone' => 'phone-work',
-+//UNCOMMENTIFIMSP            'fax' => 'fax',
-+//UNCOMMENTIFIMSP            'homePhone' => 'phone-home',
-+//UNCOMMENTIFIMSP            'cellPhone' => 'cellphone',
-+//UNCOMMENTIFIMSP            'freebusyUrl' => 'freebusyUrl'
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'search' => array(
-+//UNCOMMENTIFIMSP            'name',
-+//UNCOMMENTIFIMSP            'email',
-+//UNCOMMENTIFIMSP            'alias',
-+//UNCOMMENTIFIMSP            'company',
-+//UNCOMMENTIFIMSP            'homePhone'
-+//UNCOMMENTIFIMSP            ),
-+//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
-+//UNCOMMENTIFIMSP        );
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    /**
-+//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
-+//UNCOMMENTIFIMSP     */
-+//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-+//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
-+//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
-+//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
-+//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
-+//UNCOMMENTIFIMSP                    $dup = true;
-+//UNCOMMENTIFIMSP                }
-+//UNCOMMENTIFIMSP            }
-+//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
-+//UNCOMMENTIFIMSP            }
-+//UNCOMMENTIFIMSP        }
-+//UNCOMMENTIFIMSP    } else {
-+//UNCOMMENTIFIMSP        $notification->push($result);
-+//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP}
- 
- /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/horde4-turba/files/pkg-deinstall.in b/mail/horde4-turba/files/pkg-deinstall.in
deleted file mode 100644
index afe8f9215da2..000000000000
--- a/mail/horde4-turba/files/pkg-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Turba config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls %%TURBADIR%%/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in
deleted file mode 100644
index f7347f3f3413..000000000000
--- a/mail/horde4-turba/files/pkg-message.in
+++ /dev/null
@@ -1,21 +0,0 @@
-************************************************************************
-Turba has been installed in %%TURBADIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see `pkg_info -D -x horde'.
-
-Then, you might have to tune the configuration files located in
-%%CONFDIR%%/, specially the file sources.php.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
-You have to create a table in your database; please see
-%%TURBADIR%%/scripts/.
-You might create a LDAP schema: please see the doc LDAP.
-
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde4-turba/pkg-descr b/mail/horde4-turba/pkg-descr
deleted file mode 100644
index 7ad5e825db08..000000000000
--- a/mail/horde4-turba/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Turba is the Horde contact management application. It makes heavy use
-of the Horde framework to provide integration with other applications.
-
-Turba is a fairly complete basic contact management application.
-SQL and LDAP backends are available.
-You can define the fields in your addressbooks in a very flexible way,
-just by changing the config files.
-And there are Horde API functions to add and search for contacts.
-
-WWW: http://horde.org/turba/
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
deleted file mode 100644
index 07ea12b087a2..000000000000
--- a/mail/horde4-turba/pkg-plist
+++ /dev/null
@@ -1,261 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%TURBADIR%%/add.php
-%%TURBADIR%%/browse.php
-%%TURBADIR%%/config/.htaccess
-%%TURBADIR%%/config/attributes.php
-%%TURBADIR%%/config/attributes.php.dist
-%%TURBADIR%%/config/conf.xml
-%%TURBADIR%%/config/menu.php
-%%TURBADIR%%/config/menu.php.dist
-%%TURBADIR%%/config/prefs.php
-%%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/sources.php
-%%TURBADIR%%/config/sources.php.dist
-%%TURBADIR%%/data.php
-%%TURBADIR%%/delete.php
-%%TURBADIR%%/display.php
-%%TURBADIR%%/edit.php
-%%TURBADIR%%/index.php
-%%TURBADIR%%/lib/.htaccess
-%%TURBADIR%%/lib/AbstractObject.php
-%%TURBADIR%%/lib/Block/minisearch.php
-%%TURBADIR%%/lib/Driver.php
-%%TURBADIR%%/lib/Driver/imsp.php
-%%TURBADIR%%/lib/Driver/kolab.php
-%%TURBADIR%%/lib/Driver/ldap.php
-%%TURBADIR%%/lib/Driver/prefs.php
-%%TURBADIR%%/lib/Driver/sql.php
-%%TURBADIR%%/lib/Group.php
-%%TURBADIR%%/lib/List.php
-%%TURBADIR%%/lib/ListView.php
-%%TURBADIR%%/lib/Object.php
-%%TURBADIR%%/lib/ObjectView.php
-%%TURBADIR%%/lib/Renderer.php
-%%TURBADIR%%/lib/Turba.php
-%%TURBADIR%%/lib/api.php
-%%TURBADIR%%/lib/base.php
-%%TURBADIR%%/lib/prefs.php
-%%TURBADIR%%/lib/version.php
-%%TURBADIR%%/locale/.htaccess
-%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/help.xml
-%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/en_US/help.xml
-%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/es_ES/help.xml
-%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/help.xml
-%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/mk_MK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/help.xml
-%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_PT/help.xml
-%%TURBADIR%%/locale/ro_RO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/help.xml
-%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
-%%TURBADIR%%/minisearch.php
-%%TURBADIR%%/po/.htaccess
-%%TURBADIR%%/po/README
-%%TURBADIR%%/po/ar_SY.po
-%%TURBADIR%%/po/bg_BG.po
-%%TURBADIR%%/po/ca_ES.po
-%%TURBADIR%%/po/cs_CZ.po
-%%TURBADIR%%/po/da_DK.po
-%%TURBADIR%%/po/de_DE.po
-%%TURBADIR%%/po/el_GR.po
-%%TURBADIR%%/po/es_ES.po
-%%TURBADIR%%/po/et_EE.po
-%%TURBADIR%%/po/fa_IR.po
-%%TURBADIR%%/po/fi_FI.po
-%%TURBADIR%%/po/fr_FR.po
-%%TURBADIR%%/po/gl_ES.po
-%%TURBADIR%%/po/hu_HU.po
-%%TURBADIR%%/po/it_IT.po
-%%TURBADIR%%/po/ja_JP.po
-%%TURBADIR%%/po/ko_KR.po
-%%TURBADIR%%/po/lt_LT.po
-%%TURBADIR%%/po/lv_LV.po
-%%TURBADIR%%/po/mk_MK.po
-%%TURBADIR%%/po/nb_NO.po
-%%TURBADIR%%/po/nl_NL.po
-%%TURBADIR%%/po/nn_NO.po
-%%TURBADIR%%/po/pl_PL.po
-%%TURBADIR%%/po/pt_BR.po
-%%TURBADIR%%/po/pt_PT.po
-%%TURBADIR%%/po/ro_RO.po
-%%TURBADIR%%/po/ru_RU.po
-%%TURBADIR%%/po/sk_SK.po
-%%TURBADIR%%/po/sl_SI.po
-%%TURBADIR%%/po/sv_SE.po
-%%TURBADIR%%/po/tr_TR.po
-%%TURBADIR%%/po/turba.pot
-%%TURBADIR%%/po/uk_UA.po
-%%TURBADIR%%/po/zh_CN.po
-%%TURBADIR%%/po/zh_TW.po
-%%TURBADIR%%/scripts/.htaccess
-%%TURBADIR%%/scripts/Turba.reg
-%%TURBADIR%%/scripts/ldap/addou
-%%TURBADIR%%/scripts/ldap/addou.pl
-%%TURBADIR%%/scripts/ldap/core.schema.patch
-%%TURBADIR%%/scripts/ldap/rfc2739.schema
-%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
-%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
-%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
-%%TURBADIR%%/scripts/sql/turba_objects.sql
-%%TURBADIR%%/scripts/sql/turba_weddingguests.sql
-%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
-%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
-%%TURBADIR%%/search.php
-%%TURBADIR%%/templates/.htaccess
-%%TURBADIR%%/templates/block/minisearch.inc
-%%TURBADIR%%/templates/browse/actions.inc
-%%TURBADIR%%/templates/browse/column_footers.inc
-%%TURBADIR%%/templates/browse/column_headers.inc
-%%TURBADIR%%/templates/browse/contactrow.inc
-%%TURBADIR%%/templates/browse/footer.inc
-%%TURBADIR%%/templates/browse/footerAlpha.inc
-%%TURBADIR%%/templates/browse/header.inc
-%%TURBADIR%%/templates/browse/javascript.inc
-%%TURBADIR%%/templates/browse/search.inc
-%%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
-%%TURBADIR%%/templates/common-header.inc
-%%TURBADIR%%/templates/data/export.inc
-%%TURBADIR%%/templates/data/import.inc
-%%TURBADIR%%/templates/menu.inc
-%%TURBADIR%%/templates/prefs/columnselect.inc
-%%TURBADIR%%/test.php
-%%TURBADIR%%/themes/graphics/contact.png
-%%TURBADIR%%/themes/graphics/favicon.ico
-%%TURBADIR%%/themes/graphics/group.png
-%%TURBADIR%%/themes/graphics/menu/browse.png
-%%TURBADIR%%/themes/graphics/menu/new.png
-%%TURBADIR%%/themes/graphics/new.png
-%%TURBADIR%%/themes/graphics/turba.png
-%%TURBADIR%%/themes/screen.css
-%%TURBADIR%%/vcard.php
-%%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
-@dirrm %%TURBADIR%%/themes/graphics/menu
-@dirrm %%TURBADIR%%/themes/graphics
-@dirrm %%TURBADIR%%/themes
-@dirrmtry %%TURBADIR%%/config
-@dirrmtry %%TURBADIR%%
diff --git a/mail/ilohamail-devel/Makefile b/mail/ilohamail-devel/Makefile
deleted file mode 100644
index 42e3ab4394ba..000000000000
--- a/mail/ilohamail-devel/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for:	ilohamail
-# Date created:		2004-01-20
-# Whom:			TAKATSU Tomonari <tota@rtfm.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ilohamail
-PORTVERSION=	0.8.13
-PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ilohamail
-DISTNAME=	IlohaMail-${PORTVERSION}
-
-MAINTAINER=	tota@rtfm.jp
-COMMENT=	IlohaMail is a lightweight multilingual webmail program
-
-NO_BUILD=	yes
-USE_PHP=	pcre
-WANT_PHP_WEB=	yes
-
-.if !defined(WITHOUT_MYSQL)
-USE_PHP+=	mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if !defined(WITHOUT_WWWDIR)
-ILOHADIR=	${PREFIX}/www/ilohamail
-.else
-ILOHADIR=	${PREFIX}/ilohamail
-.endif
-
-PLIST_SUB+=	ILOHADIR="${ILOHADIR:S,^${PREFIX}/,,}"
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  define WITHOUT_MYSQL: not to use MySQL back-end"
-	@${ECHO_MSG} ""
-
-do-install:
-	@${MKDIR} ${ILOHADIR}
-	${CP} -Rp ${WRKSRC}/IlohaMail/ ${ILOHADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ILOHADIR}/data
-.if !defined(WITHOUT_MYSQL)
-	@${MKDIR} ${DATADIR}
-	${CP} -Rp ${WRKSRC}/MySQL ${DATADIR}
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; ${CP} -Rp INSTALL README RELEASE_NOTES \
-		THEMES TODO UPGRADING Manual ${DOCSDIR}
-.endif
-
-post-install:
-	@${SED} -e 's|%%ILOHADIR%%|${ILOHADIR}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
-		< ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/ilohamail-devel/distinfo b/mail/ilohamail-devel/distinfo
deleted file mode 100644
index d330ada57fde..000000000000
--- a/mail/ilohamail-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (IlohaMail-0.8.13.tar.gz) = 491f1a7e9ab3a5e34c006c9693ef6406
-SHA256 (IlohaMail-0.8.13.tar.gz) = 6d9b471c58e75f1356742bf19b56ebbc1c77e9c23e72198eaf16df6648c44754
-SIZE (IlohaMail-0.8.13.tar.gz) = 364963
diff --git a/mail/ilohamail-devel/pkg-descr b/mail/ilohamail-devel/pkg-descr
deleted file mode 100644
index e0d6ae38c9cc..000000000000
--- a/mail/ilohamail-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-IlohaMail (pronounced: e-lo-ha-mail) is a lightweight, yet full featured,
-multilingual webmail program that is easy to use and install. It runs on a
-stock, default build of PHP, and does not require databases (although
-database support is available).  IlohaMail supports IMAP and POP3.
-
-WWW:	http://ilohamail.org/
diff --git a/mail/ilohamail-devel/pkg-message b/mail/ilohamail-devel/pkg-message
deleted file mode 100644
index 64409c974ac2..000000000000
--- a/mail/ilohamail-devel/pkg-message
+++ /dev/null
@@ -1,41 +0,0 @@
-==========================================================================
-IlohaMail has now been installed.
-
-Create a redirect one of the following methods:
- - add an alias to apache's httpd.conf pointing to %%ILOHADIR%%/source
- - create a VirtualHost with DocumentRoot set to %%ILOHADIR%%/source
- - make a symbolic link to %%ILOHADIR%%/source
-
-Check your PHP.ini file.  You need:
- - short_open_tag = On
- - file_uploads = On
-
-Edit %%ILOHADIR%%/conf/conf.inc and
-%%ILOHADIR%%/conf/login.inc files as necessary.
-
-Using the MySQL back-end is also recommended.
-
-  1. Create database user who has rights on webmail database manipulation
-     by following "sample" mysql commands:
-
-     $ mysql -u root -p
-     mysql> use mysql;
-     mysql> grant select,insert,update,delete,index,
-         -> alter,create,drop,references, lock tables,
-         -> create temporary tables on webmail.* to webmail@localhost
-         -> identified by 'password';
-     mysql> flush privileges;
-
-  2. Create a MySQL database.
-     $ mysqladmin create webmail
-
-  3. Create tables.
-     $ mysql webmail < %%DATADIR%%/MySQL/sql
-
-  4. Configure %%ILOHADIR%%/conf/db_conf.php.
-
-  5. Set value of $backend in %%ILOHADIR%%/conf/conf.inc from "FS" to "DB".
-
-For more complete database setup, post-installation instructions
-please read IlohaMail Guide in %%DOCSDIR%%/Manual.
-==========================================================================
diff --git a/mail/ilohamail-devel/pkg-plist b/mail/ilohamail-devel/pkg-plist
deleted file mode 100644
index f01b22d2aa0e..000000000000
--- a/mail/ilohamail-devel/pkg-plist
+++ /dev/null
@@ -1,833 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.MySQL.html
-%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.html
-%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.php.html
-%%PORTDOCS%%%%DOCSDIR%%/Manual/custom.smtp.html
-%%PORTDOCS%%%%DOCSDIR%%/Manual/install.html
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/THEMES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%MYSQL%%%%DATADIR%%/MySQL/0.7.3.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.7.5.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.7.6.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.7.9.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.8.0.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.8.10.sql
-%%MYSQL%%%%DATADIR%%/MySQL/0.8.5.sql
-%%MYSQL%%%%DATADIR%%/MySQL/sql
-%%ILOHADIR%%/conf/conf.inc
-%%ILOHADIR%%/conf/custom_auth.inc
-%%ILOHADIR%%/conf/db_conf.php
-%%ILOHADIR%%/conf/defaults.generic.inc
-%%ILOHADIR%%/conf/defaults.inc
-%%ILOHADIR%%/conf/login.inc
-%%ILOHADIR%%/conf/login_blurb.inc
-%%ILOHADIR%%/conf/login_title.inc
-%%ILOHADIR%%/conf/mysqlrc.inc
-%%ILOHADIR%%/conf/new_user.inc
-%%ILOHADIR%%/data/cache/index.html
-%%ILOHADIR%%/data/gpg/index.html
-%%ILOHADIR%%/data/index.html
-%%ILOHADIR%%/data/sessions/index.html
-%%ILOHADIR%%/data/uploads/index.html
-%%ILOHADIR%%/data/users/index.html
-%%ILOHADIR%%/include/antispam.inc
-%%ILOHADIR%%/include/array2php.inc
-%%ILOHADIR%%/include/array2sql.inc
-%%ILOHADIR%%/include/as_update.DB.inc
-%%ILOHADIR%%/include/as_update.inc
-%%ILOHADIR%%/include/cache.DB.inc
-%%ILOHADIR%%/include/cache.FS.inc
-%%ILOHADIR%%/include/cache.inc
-%%ILOHADIR%%/include/calendar.inc
-%%ILOHADIR%%/include/contacts_commons.inc
-%%ILOHADIR%%/include/css.inc
-%%ILOHADIR%%/include/data_manager.FS.inc
-%%ILOHADIR%%/include/data_manager.MySQL.inc
-%%ILOHADIR%%/include/data_manager.inc
-%%ILOHADIR%%/include/display_monthly_calendar.inc
-%%ILOHADIR%%/include/edit_calendar.inc
-%%ILOHADIR%%/include/encryption.inc
-%%ILOHADIR%%/include/gpg.inc
-%%ILOHADIR%%/include/header_main.inc
-%%ILOHADIR%%/include/icl.inc
-%%ILOHADIR%%/include/idba.MySQL.inc
-%%ILOHADIR%%/include/identities.inc
-%%ILOHADIR%%/include/imap.inc
-%%ILOHADIR%%/include/init.inc
-%%ILOHADIR%%/include/javascript.inc
-%%ILOHADIR%%/include/langs.inc
-%%ILOHADIR%%/include/log.DB.inc
-%%ILOHADIR%%/include/log.FS.inc
-%%ILOHADIR%%/include/log.inc
-%%ILOHADIR%%/include/log.syslog.inc
-%%ILOHADIR%%/include/main.inc
-%%ILOHADIR%%/include/main_tools.inc
-%%ILOHADIR%%/include/mime.inc
-%%ILOHADIR%%/include/mod_base64.inc
-%%ILOHADIR%%/include/nocache.inc
-%%ILOHADIR%%/include/pop3.inc
-%%ILOHADIR%%/include/pref_header.inc
-%%ILOHADIR%%/include/qp_enc.inc
-%%ILOHADIR%%/include/read_message_handler.inc
-%%ILOHADIR%%/include/read_message_print.inc
-%%ILOHADIR%%/include/read_message_tools.inc
-%%ILOHADIR%%/include/read_tnef_print.inc
-%%ILOHADIR%%/include/ryosdates.inc
-%%ILOHADIR%%/include/ryosimap.inc
-%%ILOHADIR%%/include/save_colors.DB.inc
-%%ILOHADIR%%/include/save_colors.FS.inc
-%%ILOHADIR%%/include/save_colors.inc
-%%ILOHADIR%%/include/save_prefs.DB.inc
-%%ILOHADIR%%/include/save_prefs.FS.inc
-%%ILOHADIR%%/include/save_prefs.inc
-%%ILOHADIR%%/include/session_auth.DB.inc
-%%ILOHADIR%%/include/session_auth.FS.inc
-%%ILOHADIR%%/include/session_auth.inc
-%%ILOHADIR%%/include/session_close.DB.inc
-%%ILOHADIR%%/include/session_close.FS.inc
-%%ILOHADIR%%/include/session_close.inc
-%%ILOHADIR%%/include/smtp.inc
-%%ILOHADIR%%/include/sort2darray.inc
-%%ILOHADIR%%/include/spellcheck.inc
-%%ILOHADIR%%/include/stack.inc
-%%ILOHADIR%%/include/stopwatch.inc
-%%ILOHADIR%%/include/super2global.inc
-%%ILOHADIR%%/include/tnef_decoder.inc
-%%ILOHADIR%%/include/utf7.inc
-%%ILOHADIR%%/include/utf8.inc
-%%ILOHADIR%%/include/version.inc
-%%ILOHADIR%%/include/write_sinc.DB.inc
-%%ILOHADIR%%/include/write_sinc.FS.inc
-%%ILOHADIR%%/include/write_sinc.inc
-%%ILOHADIR%%/index.html
-%%ILOHADIR%%/lang/BIG5.inc
-%%ILOHADIR%%/lang/EUC-JP.inc
-%%ILOHADIR%%/lang/EUC-KR.inc
-%%ILOHADIR%%/lang/GB2312.inc
-%%ILOHADIR%%/lang/ISO-8859-1.inc
-%%ILOHADIR%%/lang/ISO-8859-2.inc
-%%ILOHADIR%%/lang/ISO-8859-9.inc
-%%ILOHADIR%%/lang/US-ASCII.inc
-%%ILOHADIR%%/lang/UTF-8.inc
-%%ILOHADIR%%/lang/Windows-1251.inc
-%%ILOHADIR%%/lang/Windows-1255.inc
-%%ILOHADIR%%/lang/Windows-1256.inc
-%%ILOHADIR%%/lang/X-EUC-JP.inc
-%%ILOHADIR%%/lang/ar/bookmarks.inc
-%%ILOHADIR%%/lang/ar/calendar.inc
-%%ILOHADIR%%/lang/ar/compose.inc
-%%ILOHADIR%%/lang/ar/contacts.inc
-%%ILOHADIR%%/lang/ar/cp.inc
-%%ILOHADIR%%/lang/ar/dates.inc
-%%ILOHADIR%%/lang/ar/defaultFolders.inc
-%%ILOHADIR%%/lang/ar/edit_contact.inc
-%%ILOHADIR%%/lang/ar/edit_folders.inc
-%%ILOHADIR%%/lang/ar/folders.inc
-%%ILOHADIR%%/lang/ar/init.inc
-%%ILOHADIR%%/lang/ar/login.inc
-%%ILOHADIR%%/lang/ar/main.inc
-%%ILOHADIR%%/lang/ar/pref_colors.inc
-%%ILOHADIR%%/lang/ar/pref_identities.inc
-%%ILOHADIR%%/lang/ar/prefs.inc
-%%ILOHADIR%%/lang/ar/quota.inc
-%%ILOHADIR%%/lang/ar/read_message.inc
-%%ILOHADIR%%/lang/ar/search.inc
-%%ILOHADIR%%/lang/ar/search_errors.inc
-%%ILOHADIR%%/lang/ar/tool.inc
-%%ILOHADIR%%/lang/bg/bookmarks.inc
-%%ILOHADIR%%/lang/bg/calendar.inc
-%%ILOHADIR%%/lang/bg/compose.inc
-%%ILOHADIR%%/lang/bg/contacts.inc
-%%ILOHADIR%%/lang/bg/cp.inc
-%%ILOHADIR%%/lang/bg/dates.inc
-%%ILOHADIR%%/lang/bg/defaultFolders.inc
-%%ILOHADIR%%/lang/bg/edit_contact.inc
-%%ILOHADIR%%/lang/bg/edit_folders.inc
-%%ILOHADIR%%/lang/bg/folders.inc
-%%ILOHADIR%%/lang/bg/init.inc
-%%ILOHADIR%%/lang/bg/login.inc
-%%ILOHADIR%%/lang/bg/main.inc
-%%ILOHADIR%%/lang/bg/pref_colors.inc
-%%ILOHADIR%%/lang/bg/pref_identities.inc
-%%ILOHADIR%%/lang/bg/prefs.inc
-%%ILOHADIR%%/lang/bg/quota.inc
-%%ILOHADIR%%/lang/bg/read_message.inc
-%%ILOHADIR%%/lang/bg/search.inc
-%%ILOHADIR%%/lang/bg/search_errors.inc
-%%ILOHADIR%%/lang/bg/tool.inc
-%%ILOHADIR%%/lang/br/bookmarks.inc
-%%ILOHADIR%%/lang/br/calendar.inc
-%%ILOHADIR%%/lang/br/compose.inc
-%%ILOHADIR%%/lang/br/contacts.inc
-%%ILOHADIR%%/lang/br/cp.inc
-%%ILOHADIR%%/lang/br/dates.inc
-%%ILOHADIR%%/lang/br/defaultFolders.inc
-%%ILOHADIR%%/lang/br/edit_contact.inc
-%%ILOHADIR%%/lang/br/edit_folders.inc
-%%ILOHADIR%%/lang/br/folders.inc
-%%ILOHADIR%%/lang/br/init.inc
-%%ILOHADIR%%/lang/br/login.inc
-%%ILOHADIR%%/lang/br/main.inc
-%%ILOHADIR%%/lang/br/pref_colors.inc
-%%ILOHADIR%%/lang/br/pref_identities.inc
-%%ILOHADIR%%/lang/br/prefs.inc
-%%ILOHADIR%%/lang/br/quota.inc
-%%ILOHADIR%%/lang/br/read_message.inc
-%%ILOHADIR%%/lang/br/search.inc
-%%ILOHADIR%%/lang/br/search_errors.inc
-%%ILOHADIR%%/lang/br/tool.inc
-%%ILOHADIR%%/lang/cat/bookmarks.inc
-%%ILOHADIR%%/lang/cat/calendar.inc
-%%ILOHADIR%%/lang/cat/compose.inc
-%%ILOHADIR%%/lang/cat/contacts.inc
-%%ILOHADIR%%/lang/cat/cp.inc
-%%ILOHADIR%%/lang/cat/dates.inc
-%%ILOHADIR%%/lang/cat/defaultFolders.inc
-%%ILOHADIR%%/lang/cat/edit_contact.inc
-%%ILOHADIR%%/lang/cat/edit_folders.inc
-%%ILOHADIR%%/lang/cat/folders.inc
-%%ILOHADIR%%/lang/cat/init.inc
-%%ILOHADIR%%/lang/cat/login.inc
-%%ILOHADIR%%/lang/cat/main.inc
-%%ILOHADIR%%/lang/cat/pref_colors.inc
-%%ILOHADIR%%/lang/cat/pref_identities.inc
-%%ILOHADIR%%/lang/cat/prefs.inc
-%%ILOHADIR%%/lang/cat/quota.inc
-%%ILOHADIR%%/lang/cat/read_message.inc
-%%ILOHADIR%%/lang/cat/search.inc
-%%ILOHADIR%%/lang/cat/search_errors.inc
-%%ILOHADIR%%/lang/cat/tool.inc
-%%ILOHADIR%%/lang/cn/bookmarks.inc
-%%ILOHADIR%%/lang/cn/calendar.inc
-%%ILOHADIR%%/lang/cn/compose.inc
-%%ILOHADIR%%/lang/cn/contacts.inc
-%%ILOHADIR%%/lang/cn/cp.inc
-%%ILOHADIR%%/lang/cn/dates.inc
-%%ILOHADIR%%/lang/cn/defaultFolders.inc
-%%ILOHADIR%%/lang/cn/edit_contact.inc
-%%ILOHADIR%%/lang/cn/edit_folders.inc
-%%ILOHADIR%%/lang/cn/folders.inc
-%%ILOHADIR%%/lang/cn/init.inc
-%%ILOHADIR%%/lang/cn/login.inc
-%%ILOHADIR%%/lang/cn/main.inc
-%%ILOHADIR%%/lang/cn/pref_colors.inc
-%%ILOHADIR%%/lang/cn/pref_identities.inc
-%%ILOHADIR%%/lang/cn/prefs.inc
-%%ILOHADIR%%/lang/cn/quota.inc
-%%ILOHADIR%%/lang/cn/read_message.inc
-%%ILOHADIR%%/lang/cn/search.inc
-%%ILOHADIR%%/lang/cn/search_errors.inc
-%%ILOHADIR%%/lang/cn/tool.inc
-%%ILOHADIR%%/lang/common.inc
-%%ILOHADIR%%/lang/cz/bookmarks.inc
-%%ILOHADIR%%/lang/cz/calendar.inc
-%%ILOHADIR%%/lang/cz/compose.inc
-%%ILOHADIR%%/lang/cz/contacts.inc
-%%ILOHADIR%%/lang/cz/cp.inc
-%%ILOHADIR%%/lang/cz/dates.inc
-%%ILOHADIR%%/lang/cz/defaultFolders.inc
-%%ILOHADIR%%/lang/cz/edit_contact.inc
-%%ILOHADIR%%/lang/cz/edit_folders.inc
-%%ILOHADIR%%/lang/cz/folders.inc
-%%ILOHADIR%%/lang/cz/init.inc
-%%ILOHADIR%%/lang/cz/login.inc
-%%ILOHADIR%%/lang/cz/main.inc
-%%ILOHADIR%%/lang/cz/pref_colors.inc
-%%ILOHADIR%%/lang/cz/pref_identities.inc
-%%ILOHADIR%%/lang/cz/prefs.inc
-%%ILOHADIR%%/lang/cz/quota.inc
-%%ILOHADIR%%/lang/cz/read_message.inc
-%%ILOHADIR%%/lang/cz/search.inc
-%%ILOHADIR%%/lang/cz/search_errors.inc
-%%ILOHADIR%%/lang/cz/tool.inc
-%%ILOHADIR%%/lang/de/bookmarks.inc
-%%ILOHADIR%%/lang/de/calendar.inc
-%%ILOHADIR%%/lang/de/compose.inc
-%%ILOHADIR%%/lang/de/contacts.inc
-%%ILOHADIR%%/lang/de/cp.inc
-%%ILOHADIR%%/lang/de/dates.inc
-%%ILOHADIR%%/lang/de/defaultFolders.inc
-%%ILOHADIR%%/lang/de/edit_contact.inc
-%%ILOHADIR%%/lang/de/edit_folders.inc
-%%ILOHADIR%%/lang/de/folders.inc
-%%ILOHADIR%%/lang/de/init.inc
-%%ILOHADIR%%/lang/de/login.inc
-%%ILOHADIR%%/lang/de/main.inc
-%%ILOHADIR%%/lang/de/pref_colors.inc
-%%ILOHADIR%%/lang/de/pref_identities.inc
-%%ILOHADIR%%/lang/de/prefs.inc
-%%ILOHADIR%%/lang/de/quota.inc
-%%ILOHADIR%%/lang/de/read_message.inc
-%%ILOHADIR%%/lang/de/search.inc
-%%ILOHADIR%%/lang/de/search_errors.inc
-%%ILOHADIR%%/lang/de/tool.inc
-%%ILOHADIR%%/lang/dk/bookmarks.inc
-%%ILOHADIR%%/lang/dk/calendar.inc
-%%ILOHADIR%%/lang/dk/compose.inc
-%%ILOHADIR%%/lang/dk/contacts.inc
-%%ILOHADIR%%/lang/dk/cp.inc
-%%ILOHADIR%%/lang/dk/dates.inc
-%%ILOHADIR%%/lang/dk/defaultFolders.inc
-%%ILOHADIR%%/lang/dk/edit_contact.inc
-%%ILOHADIR%%/lang/dk/edit_folders.inc
-%%ILOHADIR%%/lang/dk/folders.inc
-%%ILOHADIR%%/lang/dk/init.inc
-%%ILOHADIR%%/lang/dk/login.inc
-%%ILOHADIR%%/lang/dk/main.inc
-%%ILOHADIR%%/lang/dk/pref_colors.inc
-%%ILOHADIR%%/lang/dk/pref_identities.inc
-%%ILOHADIR%%/lang/dk/prefs.inc
-%%ILOHADIR%%/lang/dk/quota.inc
-%%ILOHADIR%%/lang/dk/read_message.inc
-%%ILOHADIR%%/lang/dk/search.inc
-%%ILOHADIR%%/lang/dk/search_errors.inc
-%%ILOHADIR%%/lang/dk/tool.inc
-%%ILOHADIR%%/lang/eng/bookmarks.inc
-%%ILOHADIR%%/lang/eng/calendar.inc
-%%ILOHADIR%%/lang/eng/compose.inc
-%%ILOHADIR%%/lang/eng/contacts.inc
-%%ILOHADIR%%/lang/eng/cp.inc
-%%ILOHADIR%%/lang/eng/dates.inc
-%%ILOHADIR%%/lang/eng/defaultFolders.inc
-%%ILOHADIR%%/lang/eng/edit_contact.inc
-%%ILOHADIR%%/lang/eng/edit_folders.inc
-%%ILOHADIR%%/lang/eng/folders.inc
-%%ILOHADIR%%/lang/eng/init.inc
-%%ILOHADIR%%/lang/eng/login.inc
-%%ILOHADIR%%/lang/eng/main.inc
-%%ILOHADIR%%/lang/eng/pref_colors.inc
-%%ILOHADIR%%/lang/eng/pref_identities.inc
-%%ILOHADIR%%/lang/eng/prefs.inc
-%%ILOHADIR%%/lang/eng/quota.inc
-%%ILOHADIR%%/lang/eng/read_message.inc
-%%ILOHADIR%%/lang/eng/search.inc
-%%ILOHADIR%%/lang/eng/search_errors.inc
-%%ILOHADIR%%/lang/eng/tool.inc
-%%ILOHADIR%%/lang/eng_GB/bookmarks.inc
-%%ILOHADIR%%/lang/eng_GB/calendar.inc
-%%ILOHADIR%%/lang/eng_GB/compose.inc
-%%ILOHADIR%%/lang/eng_GB/contacts.inc
-%%ILOHADIR%%/lang/eng_GB/cp.inc
-%%ILOHADIR%%/lang/eng_GB/dates.inc
-%%ILOHADIR%%/lang/eng_GB/defaultFolders.inc
-%%ILOHADIR%%/lang/eng_GB/edit_contact.inc
-%%ILOHADIR%%/lang/eng_GB/edit_folders.inc
-%%ILOHADIR%%/lang/eng_GB/folders.inc
-%%ILOHADIR%%/lang/eng_GB/init.inc
-%%ILOHADIR%%/lang/eng_GB/login.inc
-%%ILOHADIR%%/lang/eng_GB/main.inc
-%%ILOHADIR%%/lang/eng_GB/pref_colors.inc
-%%ILOHADIR%%/lang/eng_GB/pref_identities.inc
-%%ILOHADIR%%/lang/eng_GB/prefs.inc
-%%ILOHADIR%%/lang/eng_GB/quota.inc
-%%ILOHADIR%%/lang/eng_GB/read_message.inc
-%%ILOHADIR%%/lang/eng_GB/search.inc
-%%ILOHADIR%%/lang/eng_GB/search_errors.inc
-%%ILOHADIR%%/lang/eng_GB/tool.inc
-%%ILOHADIR%%/lang/es/bookmarks.inc
-%%ILOHADIR%%/lang/es/calendar.inc
-%%ILOHADIR%%/lang/es/compose.inc
-%%ILOHADIR%%/lang/es/contacts.inc
-%%ILOHADIR%%/lang/es/cp.inc
-%%ILOHADIR%%/lang/es/dates.inc
-%%ILOHADIR%%/lang/es/defaultFolders.inc
-%%ILOHADIR%%/lang/es/edit_contact.inc
-%%ILOHADIR%%/lang/es/edit_folders.inc
-%%ILOHADIR%%/lang/es/folders.inc
-%%ILOHADIR%%/lang/es/init.inc
-%%ILOHADIR%%/lang/es/login.inc
-%%ILOHADIR%%/lang/es/main.inc
-%%ILOHADIR%%/lang/es/pref_colors.inc
-%%ILOHADIR%%/lang/es/pref_identities.inc
-%%ILOHADIR%%/lang/es/prefs.inc
-%%ILOHADIR%%/lang/es/quota.inc
-%%ILOHADIR%%/lang/es/read_message.inc
-%%ILOHADIR%%/lang/es/search.inc
-%%ILOHADIR%%/lang/es/search_errors.inc
-%%ILOHADIR%%/lang/es/tool.inc
-%%ILOHADIR%%/lang/fr/bookmarks.inc
-%%ILOHADIR%%/lang/fr/calendar.inc
-%%ILOHADIR%%/lang/fr/compose.inc
-%%ILOHADIR%%/lang/fr/contacts.inc
-%%ILOHADIR%%/lang/fr/cp.inc
-%%ILOHADIR%%/lang/fr/dates.inc
-%%ILOHADIR%%/lang/fr/defaultFolders.inc
-%%ILOHADIR%%/lang/fr/edit_contact.inc
-%%ILOHADIR%%/lang/fr/edit_folders.inc
-%%ILOHADIR%%/lang/fr/folders.inc
-%%ILOHADIR%%/lang/fr/init.inc
-%%ILOHADIR%%/lang/fr/login.inc
-%%ILOHADIR%%/lang/fr/main.inc
-%%ILOHADIR%%/lang/fr/pref_colors.inc
-%%ILOHADIR%%/lang/fr/pref_identities.inc
-%%ILOHADIR%%/lang/fr/prefs.inc
-%%ILOHADIR%%/lang/fr/quota.inc
-%%ILOHADIR%%/lang/fr/read_message.inc
-%%ILOHADIR%%/lang/fr/search.inc
-%%ILOHADIR%%/lang/fr/search_errors.inc
-%%ILOHADIR%%/lang/fr/tool.inc
-%%ILOHADIR%%/lang/ga/bookmarks.inc
-%%ILOHADIR%%/lang/ga/calendar.inc
-%%ILOHADIR%%/lang/ga/compose.inc
-%%ILOHADIR%%/lang/ga/contacts.inc
-%%ILOHADIR%%/lang/ga/cp.inc
-%%ILOHADIR%%/lang/ga/dates.inc
-%%ILOHADIR%%/lang/ga/defaultFolders.inc
-%%ILOHADIR%%/lang/ga/edit_contact.inc
-%%ILOHADIR%%/lang/ga/edit_folders.inc
-%%ILOHADIR%%/lang/ga/folders.inc
-%%ILOHADIR%%/lang/ga/init.inc
-%%ILOHADIR%%/lang/ga/login.inc
-%%ILOHADIR%%/lang/ga/main.inc
-%%ILOHADIR%%/lang/ga/pref_colors.inc
-%%ILOHADIR%%/lang/ga/pref_identities.inc
-%%ILOHADIR%%/lang/ga/prefs.inc
-%%ILOHADIR%%/lang/ga/quota.inc
-%%ILOHADIR%%/lang/ga/read_message.inc
-%%ILOHADIR%%/lang/ga/search.inc
-%%ILOHADIR%%/lang/ga/search_errors.inc
-%%ILOHADIR%%/lang/ga/tool.inc
-%%ILOHADIR%%/lang/hu/bookmarks.inc
-%%ILOHADIR%%/lang/hu/calendar.inc
-%%ILOHADIR%%/lang/hu/compose.inc
-%%ILOHADIR%%/lang/hu/contacts.inc
-%%ILOHADIR%%/lang/hu/cp.inc
-%%ILOHADIR%%/lang/hu/dates.inc
-%%ILOHADIR%%/lang/hu/defaultFolders.inc
-%%ILOHADIR%%/lang/hu/edit_contact.inc
-%%ILOHADIR%%/lang/hu/edit_folders.inc
-%%ILOHADIR%%/lang/hu/folders.inc
-%%ILOHADIR%%/lang/hu/init.inc
-%%ILOHADIR%%/lang/hu/login.inc
-%%ILOHADIR%%/lang/hu/main.inc
-%%ILOHADIR%%/lang/hu/pref_colors.inc
-%%ILOHADIR%%/lang/hu/pref_identities.inc
-%%ILOHADIR%%/lang/hu/prefs.inc
-%%ILOHADIR%%/lang/hu/quota.inc
-%%ILOHADIR%%/lang/hu/read_message.inc
-%%ILOHADIR%%/lang/hu/search.inc
-%%ILOHADIR%%/lang/hu/search_errors.inc
-%%ILOHADIR%%/lang/hu/tool.inc
-%%ILOHADIR%%/lang/it/bookmarks.inc
-%%ILOHADIR%%/lang/it/calendar.inc
-%%ILOHADIR%%/lang/it/compose.inc
-%%ILOHADIR%%/lang/it/contacts.inc
-%%ILOHADIR%%/lang/it/cp.inc
-%%ILOHADIR%%/lang/it/dates.inc
-%%ILOHADIR%%/lang/it/defaultFolders.inc
-%%ILOHADIR%%/lang/it/edit_contact.inc
-%%ILOHADIR%%/lang/it/edit_folders.inc
-%%ILOHADIR%%/lang/it/folders.inc
-%%ILOHADIR%%/lang/it/init.inc
-%%ILOHADIR%%/lang/it/login.inc
-%%ILOHADIR%%/lang/it/main.inc
-%%ILOHADIR%%/lang/it/pref_colors.inc
-%%ILOHADIR%%/lang/it/pref_identities.inc
-%%ILOHADIR%%/lang/it/prefs.inc
-%%ILOHADIR%%/lang/it/quota.inc
-%%ILOHADIR%%/lang/it/read_message.inc
-%%ILOHADIR%%/lang/it/search.inc
-%%ILOHADIR%%/lang/it/search_errors.inc
-%%ILOHADIR%%/lang/it/tool.inc
-%%ILOHADIR%%/lang/jp/bookmarks.inc
-%%ILOHADIR%%/lang/jp/calendar.inc
-%%ILOHADIR%%/lang/jp/compose.inc
-%%ILOHADIR%%/lang/jp/contacts.inc
-%%ILOHADIR%%/lang/jp/cp.inc
-%%ILOHADIR%%/lang/jp/dates.inc
-%%ILOHADIR%%/lang/jp/defaultFolders.inc
-%%ILOHADIR%%/lang/jp/edit_contact.inc
-%%ILOHADIR%%/lang/jp/edit_folders.inc
-%%ILOHADIR%%/lang/jp/folders.inc
-%%ILOHADIR%%/lang/jp/init.inc
-%%ILOHADIR%%/lang/jp/jcode.inc
-%%ILOHADIR%%/lang/jp/login.inc
-%%ILOHADIR%%/lang/jp/main.inc
-%%ILOHADIR%%/lang/jp/pref_colors.inc
-%%ILOHADIR%%/lang/jp/pref_identities.inc
-%%ILOHADIR%%/lang/jp/prefs.inc
-%%ILOHADIR%%/lang/jp/quota.inc
-%%ILOHADIR%%/lang/jp/read_message.inc
-%%ILOHADIR%%/lang/jp/search.inc
-%%ILOHADIR%%/lang/jp/search_errors.inc
-%%ILOHADIR%%/lang/jp/tool.inc
-%%ILOHADIR%%/lang/kr/bookmarks.inc
-%%ILOHADIR%%/lang/kr/calendar.inc
-%%ILOHADIR%%/lang/kr/compose.inc
-%%ILOHADIR%%/lang/kr/contacts.inc
-%%ILOHADIR%%/lang/kr/cp.inc
-%%ILOHADIR%%/lang/kr/dates.inc
-%%ILOHADIR%%/lang/kr/defaultFolders.inc
-%%ILOHADIR%%/lang/kr/edit_contact.inc
-%%ILOHADIR%%/lang/kr/edit_folders.inc
-%%ILOHADIR%%/lang/kr/folders.inc
-%%ILOHADIR%%/lang/kr/init.inc
-%%ILOHADIR%%/lang/kr/login.inc
-%%ILOHADIR%%/lang/kr/main.inc
-%%ILOHADIR%%/lang/kr/pref_colors.inc
-%%ILOHADIR%%/lang/kr/pref_identities.inc
-%%ILOHADIR%%/lang/kr/prefs.inc
-%%ILOHADIR%%/lang/kr/quota.inc
-%%ILOHADIR%%/lang/kr/read_message.inc
-%%ILOHADIR%%/lang/kr/search.inc
-%%ILOHADIR%%/lang/kr/search_errors.inc
-%%ILOHADIR%%/lang/kr/tool.inc
-%%ILOHADIR%%/lang/nl/bookmarks.inc
-%%ILOHADIR%%/lang/nl/calendar.inc
-%%ILOHADIR%%/lang/nl/compose.inc
-%%ILOHADIR%%/lang/nl/contacts.inc
-%%ILOHADIR%%/lang/nl/cp.inc
-%%ILOHADIR%%/lang/nl/dates.inc
-%%ILOHADIR%%/lang/nl/defaultFolders.inc
-%%ILOHADIR%%/lang/nl/edit_contact.inc
-%%ILOHADIR%%/lang/nl/edit_folders.inc
-%%ILOHADIR%%/lang/nl/folders.inc
-%%ILOHADIR%%/lang/nl/init.inc
-%%ILOHADIR%%/lang/nl/login.inc
-%%ILOHADIR%%/lang/nl/main.inc
-%%ILOHADIR%%/lang/nl/pref_colors.inc
-%%ILOHADIR%%/lang/nl/pref_identities.inc
-%%ILOHADIR%%/lang/nl/prefs.inc
-%%ILOHADIR%%/lang/nl/quota.inc
-%%ILOHADIR%%/lang/nl/read_message.inc
-%%ILOHADIR%%/lang/nl/search.inc
-%%ILOHADIR%%/lang/nl/search_errors.inc
-%%ILOHADIR%%/lang/nl/tool.inc
-%%ILOHADIR%%/lang/nn_NO/bookmarks.inc
-%%ILOHADIR%%/lang/nn_NO/calendar.inc
-%%ILOHADIR%%/lang/nn_NO/compose.inc
-%%ILOHADIR%%/lang/nn_NO/contacts.inc
-%%ILOHADIR%%/lang/nn_NO/cp.inc
-%%ILOHADIR%%/lang/nn_NO/dates.inc
-%%ILOHADIR%%/lang/nn_NO/defaultFolders.inc
-%%ILOHADIR%%/lang/nn_NO/edit_contact.inc
-%%ILOHADIR%%/lang/nn_NO/edit_folders.inc
-%%ILOHADIR%%/lang/nn_NO/folders.inc
-%%ILOHADIR%%/lang/nn_NO/init.inc
-%%ILOHADIR%%/lang/nn_NO/login.inc
-%%ILOHADIR%%/lang/nn_NO/main.inc
-%%ILOHADIR%%/lang/nn_NO/pref_colors.inc
-%%ILOHADIR%%/lang/nn_NO/pref_identities.inc
-%%ILOHADIR%%/lang/nn_NO/prefs.inc
-%%ILOHADIR%%/lang/nn_NO/quota.inc
-%%ILOHADIR%%/lang/nn_NO/read_message.inc
-%%ILOHADIR%%/lang/nn_NO/search.inc
-%%ILOHADIR%%/lang/nn_NO/search_errors.inc
-%%ILOHADIR%%/lang/nn_NO/tool.inc
-%%ILOHADIR%%/lang/no/bookmarks.inc
-%%ILOHADIR%%/lang/no/calendar.inc
-%%ILOHADIR%%/lang/no/compose.inc
-%%ILOHADIR%%/lang/no/contacts.inc
-%%ILOHADIR%%/lang/no/cp.inc
-%%ILOHADIR%%/lang/no/dates.inc
-%%ILOHADIR%%/lang/no/defaultFolders.inc
-%%ILOHADIR%%/lang/no/edit_contact.inc
-%%ILOHADIR%%/lang/no/edit_folders.inc
-%%ILOHADIR%%/lang/no/folders.inc
-%%ILOHADIR%%/lang/no/init.inc
-%%ILOHADIR%%/lang/no/login.inc
-%%ILOHADIR%%/lang/no/main.inc
-%%ILOHADIR%%/lang/no/pref_colors.inc
-%%ILOHADIR%%/lang/no/pref_identities.inc
-%%ILOHADIR%%/lang/no/prefs.inc
-%%ILOHADIR%%/lang/no/quota.inc
-%%ILOHADIR%%/lang/no/read_message.inc
-%%ILOHADIR%%/lang/no/search.inc
-%%ILOHADIR%%/lang/no/search_errors.inc
-%%ILOHADIR%%/lang/no/tool.inc
-%%ILOHADIR%%/lang/notes.txt
-%%ILOHADIR%%/lang/pl/bookmarks.inc
-%%ILOHADIR%%/lang/pl/calendar.inc
-%%ILOHADIR%%/lang/pl/compose.inc
-%%ILOHADIR%%/lang/pl/contacts.inc
-%%ILOHADIR%%/lang/pl/cp.inc
-%%ILOHADIR%%/lang/pl/dates.inc
-%%ILOHADIR%%/lang/pl/defaultFolders.inc
-%%ILOHADIR%%/lang/pl/edit_contact.inc
-%%ILOHADIR%%/lang/pl/edit_folders.inc
-%%ILOHADIR%%/lang/pl/folders.inc
-%%ILOHADIR%%/lang/pl/init.inc
-%%ILOHADIR%%/lang/pl/login.inc
-%%ILOHADIR%%/lang/pl/main.inc
-%%ILOHADIR%%/lang/pl/pref_colors.inc
-%%ILOHADIR%%/lang/pl/pref_identities.inc
-%%ILOHADIR%%/lang/pl/prefs.inc
-%%ILOHADIR%%/lang/pl/quota.inc
-%%ILOHADIR%%/lang/pl/read_message.inc
-%%ILOHADIR%%/lang/pl/search.inc
-%%ILOHADIR%%/lang/pl/search_errors.inc
-%%ILOHADIR%%/lang/pl/tool.inc
-%%ILOHADIR%%/lang/pt/bookmarks.inc
-%%ILOHADIR%%/lang/pt/calendar.inc
-%%ILOHADIR%%/lang/pt/compose.inc
-%%ILOHADIR%%/lang/pt/contacts.inc
-%%ILOHADIR%%/lang/pt/cp.inc
-%%ILOHADIR%%/lang/pt/dates.inc
-%%ILOHADIR%%/lang/pt/defaultFolders.inc
-%%ILOHADIR%%/lang/pt/edit_contact.inc
-%%ILOHADIR%%/lang/pt/edit_folders.inc
-%%ILOHADIR%%/lang/pt/folders.inc
-%%ILOHADIR%%/lang/pt/init.inc
-%%ILOHADIR%%/lang/pt/login.inc
-%%ILOHADIR%%/lang/pt/main.inc
-%%ILOHADIR%%/lang/pt/pref_colors.inc
-%%ILOHADIR%%/lang/pt/pref_identities.inc
-%%ILOHADIR%%/lang/pt/prefs.inc
-%%ILOHADIR%%/lang/pt/quota.inc
-%%ILOHADIR%%/lang/pt/read_message.inc
-%%ILOHADIR%%/lang/pt/search.inc
-%%ILOHADIR%%/lang/pt/search_errors.inc
-%%ILOHADIR%%/lang/pt/tool.inc
-%%ILOHADIR%%/lang/ro/bookmarks.inc
-%%ILOHADIR%%/lang/ro/calendar.inc
-%%ILOHADIR%%/lang/ro/compose.inc
-%%ILOHADIR%%/lang/ro/contacts.inc
-%%ILOHADIR%%/lang/ro/cp.inc
-%%ILOHADIR%%/lang/ro/dates.inc
-%%ILOHADIR%%/lang/ro/defaultFolders.inc
-%%ILOHADIR%%/lang/ro/edit_contact.inc
-%%ILOHADIR%%/lang/ro/edit_folders.inc
-%%ILOHADIR%%/lang/ro/folders.inc
-%%ILOHADIR%%/lang/ro/init.inc
-%%ILOHADIR%%/lang/ro/login.inc
-%%ILOHADIR%%/lang/ro/main.inc
-%%ILOHADIR%%/lang/ro/pref_colors.inc
-%%ILOHADIR%%/lang/ro/pref_identities.inc
-%%ILOHADIR%%/lang/ro/prefs.inc
-%%ILOHADIR%%/lang/ro/quota.inc
-%%ILOHADIR%%/lang/ro/read_message.inc
-%%ILOHADIR%%/lang/ro/search.inc
-%%ILOHADIR%%/lang/ro/search_errors.inc
-%%ILOHADIR%%/lang/ro/tool.inc
-%%ILOHADIR%%/lang/ru/bookmarks.inc
-%%ILOHADIR%%/lang/ru/calendar.inc
-%%ILOHADIR%%/lang/ru/compose.inc
-%%ILOHADIR%%/lang/ru/contacts.inc
-%%ILOHADIR%%/lang/ru/cp.inc
-%%ILOHADIR%%/lang/ru/dates.inc
-%%ILOHADIR%%/lang/ru/defaultFolders.inc
-%%ILOHADIR%%/lang/ru/edit_contact.inc
-%%ILOHADIR%%/lang/ru/edit_folders.inc
-%%ILOHADIR%%/lang/ru/folders.inc
-%%ILOHADIR%%/lang/ru/init.inc
-%%ILOHADIR%%/lang/ru/login.inc
-%%ILOHADIR%%/lang/ru/main.inc
-%%ILOHADIR%%/lang/ru/pref_colors.inc
-%%ILOHADIR%%/lang/ru/pref_identities.inc
-%%ILOHADIR%%/lang/ru/prefs.inc
-%%ILOHADIR%%/lang/ru/quota.inc
-%%ILOHADIR%%/lang/ru/read_message.inc
-%%ILOHADIR%%/lang/ru/search.inc
-%%ILOHADIR%%/lang/ru/search_errors.inc
-%%ILOHADIR%%/lang/ru/tool.inc
-%%ILOHADIR%%/lang/se/bookmarks.inc
-%%ILOHADIR%%/lang/se/calendar.inc
-%%ILOHADIR%%/lang/se/compose.inc
-%%ILOHADIR%%/lang/se/contacts.inc
-%%ILOHADIR%%/lang/se/cp.inc
-%%ILOHADIR%%/lang/se/dates.inc
-%%ILOHADIR%%/lang/se/defaultFolders.inc
-%%ILOHADIR%%/lang/se/edit_contact.inc
-%%ILOHADIR%%/lang/se/edit_folders.inc
-%%ILOHADIR%%/lang/se/folders.inc
-%%ILOHADIR%%/lang/se/init.inc
-%%ILOHADIR%%/lang/se/login.inc
-%%ILOHADIR%%/lang/se/main.inc
-%%ILOHADIR%%/lang/se/pref_colors.inc
-%%ILOHADIR%%/lang/se/pref_identities.inc
-%%ILOHADIR%%/lang/se/prefs.inc
-%%ILOHADIR%%/lang/se/quota.inc
-%%ILOHADIR%%/lang/se/read_message.inc
-%%ILOHADIR%%/lang/se/search.inc
-%%ILOHADIR%%/lang/se/search_errors.inc
-%%ILOHADIR%%/lang/se/tool.inc
-%%ILOHADIR%%/lang/si/bookmarks.inc
-%%ILOHADIR%%/lang/si/calendar.inc
-%%ILOHADIR%%/lang/si/compose.inc
-%%ILOHADIR%%/lang/si/contacts.inc
-%%ILOHADIR%%/lang/si/cp.inc
-%%ILOHADIR%%/lang/si/dates.inc
-%%ILOHADIR%%/lang/si/defaultFolders.inc
-%%ILOHADIR%%/lang/si/edit_contact.inc
-%%ILOHADIR%%/lang/si/edit_folders.inc
-%%ILOHADIR%%/lang/si/folders.inc
-%%ILOHADIR%%/lang/si/init.inc
-%%ILOHADIR%%/lang/si/login.inc
-%%ILOHADIR%%/lang/si/main.inc
-%%ILOHADIR%%/lang/si/pref_colors.inc
-%%ILOHADIR%%/lang/si/pref_identities.inc
-%%ILOHADIR%%/lang/si/prefs.inc
-%%ILOHADIR%%/lang/si/quota.inc
-%%ILOHADIR%%/lang/si/read_message.inc
-%%ILOHADIR%%/lang/si/search.inc
-%%ILOHADIR%%/lang/si/search_errors.inc
-%%ILOHADIR%%/lang/si/tool.inc
-%%ILOHADIR%%/lang/tr/bookmarks.inc
-%%ILOHADIR%%/lang/tr/calendar.inc
-%%ILOHADIR%%/lang/tr/compose.inc
-%%ILOHADIR%%/lang/tr/contacts.inc
-%%ILOHADIR%%/lang/tr/cp.inc
-%%ILOHADIR%%/lang/tr/dates.inc
-%%ILOHADIR%%/lang/tr/defaultFolders.inc
-%%ILOHADIR%%/lang/tr/edit_contact.inc
-%%ILOHADIR%%/lang/tr/edit_folders.inc
-%%ILOHADIR%%/lang/tr/folders.inc
-%%ILOHADIR%%/lang/tr/init.inc
-%%ILOHADIR%%/lang/tr/login.inc
-%%ILOHADIR%%/lang/tr/main.inc
-%%ILOHADIR%%/lang/tr/pref_colors.inc
-%%ILOHADIR%%/lang/tr/pref_identities.inc
-%%ILOHADIR%%/lang/tr/prefs.inc
-%%ILOHADIR%%/lang/tr/quota.inc
-%%ILOHADIR%%/lang/tr/read_message.inc
-%%ILOHADIR%%/lang/tr/search.inc
-%%ILOHADIR%%/lang/tr/search_errors.inc
-%%ILOHADIR%%/lang/tr/tool.inc
-%%ILOHADIR%%/lang/tw/bookmarks.inc
-%%ILOHADIR%%/lang/tw/calendar.inc
-%%ILOHADIR%%/lang/tw/compose.inc
-%%ILOHADIR%%/lang/tw/contacts.inc
-%%ILOHADIR%%/lang/tw/cp.inc
-%%ILOHADIR%%/lang/tw/dates.inc
-%%ILOHADIR%%/lang/tw/defaultFolders.inc
-%%ILOHADIR%%/lang/tw/edit_contact.inc
-%%ILOHADIR%%/lang/tw/edit_folders.inc
-%%ILOHADIR%%/lang/tw/folders.inc
-%%ILOHADIR%%/lang/tw/init.inc
-%%ILOHADIR%%/lang/tw/login.inc
-%%ILOHADIR%%/lang/tw/main.inc
-%%ILOHADIR%%/lang/tw/pref_colors.inc
-%%ILOHADIR%%/lang/tw/pref_identities.inc
-%%ILOHADIR%%/lang/tw/prefs.inc
-%%ILOHADIR%%/lang/tw/quota.inc
-%%ILOHADIR%%/lang/tw/read_message.inc
-%%ILOHADIR%%/lang/tw/search.inc
-%%ILOHADIR%%/lang/tw/search_errors.inc
-%%ILOHADIR%%/lang/tw/tool.inc
-%%ILOHADIR%%/lang/vn/bookmarks.inc
-%%ILOHADIR%%/lang/vn/calendar.inc
-%%ILOHADIR%%/lang/vn/compose.inc
-%%ILOHADIR%%/lang/vn/contacts.inc
-%%ILOHADIR%%/lang/vn/cp.inc
-%%ILOHADIR%%/lang/vn/dates.inc
-%%ILOHADIR%%/lang/vn/defaultFolders.inc
-%%ILOHADIR%%/lang/vn/edit_contact.inc
-%%ILOHADIR%%/lang/vn/edit_folders.inc
-%%ILOHADIR%%/lang/vn/folders.inc
-%%ILOHADIR%%/lang/vn/init.inc
-%%ILOHADIR%%/lang/vn/login.inc
-%%ILOHADIR%%/lang/vn/main.inc
-%%ILOHADIR%%/lang/vn/pref_colors.inc
-%%ILOHADIR%%/lang/vn/pref_identities.inc
-%%ILOHADIR%%/lang/vn/prefs.inc
-%%ILOHADIR%%/lang/vn/quota.inc
-%%ILOHADIR%%/lang/vn/read_message.inc
-%%ILOHADIR%%/lang/vn/search.inc
-%%ILOHADIR%%/lang/vn/search_errors.inc
-%%ILOHADIR%%/lang/vn/tool.inc
-%%ILOHADIR%%/source/blank.html
-%%ILOHADIR%%/source/bookmarks.php
-%%ILOHADIR%%/source/calendar.php
-%%ILOHADIR%%/source/compose.php
-%%ILOHADIR%%/source/compose2.php
-%%ILOHADIR%%/source/contacts.php
-%%ILOHADIR%%/source/contacts_popup.php
-%%ILOHADIR%%/source/cp.php
-%%ILOHADIR%%/source/css.php
-%%ILOHADIR%%/source/edit_calendar.php
-%%ILOHADIR%%/source/edit_contact.php
-%%ILOHADIR%%/source/edit_folders.php
-%%ILOHADIR%%/source/folders.php
-%%ILOHADIR%%/source/images/inbox.GIF
-%%ILOHADIR%%/source/index.php
-%%ILOHADIR%%/source/login.php
-%%ILOHADIR%%/source/main.php
-%%ILOHADIR%%/source/pref_colors.php
-%%ILOHADIR%%/source/pref_columns.php
-%%ILOHADIR%%/source/pref_gpg.php
-%%ILOHADIR%%/source/pref_identities.php
-%%ILOHADIR%%/source/prefs.php
-%%ILOHADIR%%/source/radar.php
-%%ILOHADIR%%/source/read_message.php
-%%ILOHADIR%%/source/search_form.php
-%%ILOHADIR%%/source/synch.php
-%%ILOHADIR%%/source/themes/default/images/addc.gif
-%%ILOHADIR%%/source/themes/default/images/allr.gif
-%%ILOHADIR%%/source/themes/default/images/application.gif
-%%ILOHADIR%%/source/themes/default/images/att.gif
-%%ILOHADIR%%/source/themes/default/images/attach.gif
-%%ILOHADIR%%/source/themes/default/images/cube.gif
-%%ILOHADIR%%/source/themes/default/images/del.gif
-%%ILOHADIR%%/source/themes/default/images/folder.gif
-%%ILOHADIR%%/source/themes/default/images/forward.gif
-%%ILOHADIR%%/source/themes/default/images/heads.gif
-%%ILOHADIR%%/source/themes/default/images/image.gif
-%%ILOHADIR%%/source/themes/default/images/inbox.GIF
-%%ILOHADIR%%/source/themes/default/images/minus.gif
-%%ILOHADIR%%/source/themes/default/images/movie.gif
-%%ILOHADIR%%/source/themes/default/images/multi.gif
-%%ILOHADIR%%/source/themes/default/images/multipart.gif
-%%ILOHADIR%%/source/themes/default/images/music.gif
-%%ILOHADIR%%/source/themes/default/images/plus.gif
-%%ILOHADIR%%/source/themes/default/images/read.gif
-%%ILOHADIR%%/source/themes/default/images/reply.gif
-%%ILOHADIR%%/source/themes/default/images/showc.gif
-%%ILOHADIR%%/source/themes/default/images/src.gif
-%%ILOHADIR%%/source/themes/default/images/text.gif
-%%ILOHADIR%%/source/themes/default/images/unknown.gif
-%%ILOHADIR%%/source/themes/default/images/unread.gif
-%%ILOHADIR%%/source/themes/default/info.inc
-%%ILOHADIR%%/source/themes/default/override.inc
-%%ILOHADIR%%/source/tool.php
-%%ILOHADIR%%/source/view.php
-@dirrm %%ILOHADIR%%/source/themes/default/images
-@dirrm %%ILOHADIR%%/source/themes/default
-@dirrm %%ILOHADIR%%/source/themes
-@dirrm %%ILOHADIR%%/source/images
-@dirrm %%ILOHADIR%%/source
-@dirrm %%ILOHADIR%%/lang/vn
-@dirrm %%ILOHADIR%%/lang/tw
-@dirrm %%ILOHADIR%%/lang/tr
-@dirrm %%ILOHADIR%%/lang/si
-@dirrm %%ILOHADIR%%/lang/se
-@dirrm %%ILOHADIR%%/lang/ru
-@dirrm %%ILOHADIR%%/lang/ro
-@dirrm %%ILOHADIR%%/lang/pt
-@dirrm %%ILOHADIR%%/lang/pl
-@dirrm %%ILOHADIR%%/lang/no
-@dirrm %%ILOHADIR%%/lang/nn_NO
-@dirrm %%ILOHADIR%%/lang/nl
-@dirrm %%ILOHADIR%%/lang/kr
-@dirrm %%ILOHADIR%%/lang/jp
-@dirrm %%ILOHADIR%%/lang/it
-@dirrm %%ILOHADIR%%/lang/hu
-@dirrm %%ILOHADIR%%/lang/ga
-@dirrm %%ILOHADIR%%/lang/fr
-@dirrm %%ILOHADIR%%/lang/es
-@dirrm %%ILOHADIR%%/lang/eng_GB
-@dirrm %%ILOHADIR%%/lang/eng
-@dirrm %%ILOHADIR%%/lang/dk
-@dirrm %%ILOHADIR%%/lang/de
-@dirrm %%ILOHADIR%%/lang/cz
-@dirrm %%ILOHADIR%%/lang/cn
-@dirrm %%ILOHADIR%%/lang/cat
-@dirrm %%ILOHADIR%%/lang/br
-@dirrm %%ILOHADIR%%/lang/bg
-@dirrm %%ILOHADIR%%/lang/ar
-@dirrm %%ILOHADIR%%/lang
-@dirrm %%ILOHADIR%%/include
-@dirrm %%ILOHADIR%%/data/users
-@dirrm %%ILOHADIR%%/data/uploads
-@dirrm %%ILOHADIR%%/data/sessions
-@dirrm %%ILOHADIR%%/data/gpg
-@dirrm %%ILOHADIR%%/data/cache
-@dirrm %%ILOHADIR%%/data
-@dirrm %%ILOHADIR%%/conf
-@dirrm %%ILOHADIR%%
-%%MYSQL%%@dirrm %%DATADIR%%/MySQL
-%%MYSQL%%@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 2420d84e6d10..d35b46ee5c66 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.4
-PORTREVISION=	1
+PORTVERSION=	4.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -110,7 +109,7 @@ REINPLACE_ARGS=	-i.beforeIMP
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES  docs/TODO  docs/UPGRADING
-CONFFILE=	filter.txt header.txt menu.php mime_drivers.php motd.php \
+CONFFILE=	filter.txt header.php menu.php mime_drivers.php motd.php \
 		prefs.php servers.php trailer.txt
 SUB_DIRS=	config js lib locale po scripts templates themes
 
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 22d57099697c..08ddfec3164e 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
-SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
-SIZE (imp-h3-4.0.4.tar.gz) = 3349908
+MD5 (imp-h3-4.1.tar.gz) = dc5f86c4c6e4d61047444ff9b59dff67
+SHA256 (imp-h3-4.1.tar.gz) = 3ab27ea1b4f61dba7c25fff32ae25a8a19ff0a8de290a9d5ea035d8290cdb41e
+SIZE (imp-h3-4.1.tar.gz) = 3756910
diff --git a/mail/imp/files/patch-ab b/mail/imp/files/patch-ab
index 0ef811fa652d..70f53f65a58c 100644
--- a/mail/imp/files/patch-ab
+++ b/mail/imp/files/patch-ab
@@ -1,16 +1,14 @@
---- config/servers.php.dist.orig	Sun Dec 12 07:36:51 2004
-+++ config/servers.php.dist	Fri Dec 24 00:27:59 2004
-@@ -47,7 +47,7 @@
-  *
-  * folders: The folder path for the IMAP server.
-  *          Common values:
-- *            UW-IMAP               'mail/'  (note the trailing slash)
-+ *            UW-IMAP               'Mail/'  (note the trailing slash)
-  *            Cyrus, Courier-IMAP   'INBOX.' (note the trailing dot)
-  *            dovecot               ''
-  *
-@@ -174,14 +174,16 @@
+--- config/servers.php.dist.orig	Tue Feb  7 08:50:24 2006
++++ config/servers.php.dist	Wed Mar  8 22:01:53 2006
+@@ -204,14 +204,21 @@
  
+ /* Example configurations: */
+ 
++/* FreeBSD port note: see also
++<http://wiki.horde.org/ImpUWIMAPNamespaces>
++<http://wiki.horde.org/ImpImapConfig>
++*/
++
  $servers['imap'] = array(
      'name' => 'IMAP Server',
 -    'server' => 'imap.example.com',
@@ -19,11 +17,8 @@
      'hordeauth' => false,
 -    'protocol' => 'imap/notls',
 -    'port' => 143,
--    'folders' => 'mail/',
 +    'protocol' => '%%PROTOCOL%%',
 +    'port' => %%IMAPPORT%%,
-+    'folders' => 'Mail/',
-     'namespace' => '',
      'maildomain' => 'example.com',
 -    'smtphost' => 'smtp.example.com',
 +//  'smtphost' => 'smtp.example.com',
diff --git a/mail/imp/files/patch-config::conf.xml b/mail/imp/files/patch-config::conf.xml
index 225acb1a99c1..314c47ed5500 100644
--- a/mail/imp/files/patch-config::conf.xml
+++ b/mail/imp/files/patch-config::conf.xml
@@ -1,5 +1,5 @@
---- config/conf.xml.orig	Mon Nov 22 09:40:29 2004
-+++ config/conf.xml	Mon Nov 29 11:51:54 2004
+--- config/conf.xml.orig	Sat Jan 14 17:52:34 2006
++++ config/conf.xml	Sun Mar 12 18:24:46 2006
 @@ -6,11 +6,11 @@
     <configheader>External Utilities</configheader>
     <configstring name="spellchecker" required="false" desc="Enter the location
@@ -14,12 +14,12 @@
     <configmultienum name="gnupg_keyserver" required="false" desc="The address of
     the public PGP keyserver(s) to use.">wwwkeys.pgp.net
      <values>
-@@ -23,7 +23,7 @@
-    connecting to the PGP keyserver. Timeouts are not supported on all
-    systems.">10</configstring>
+@@ -25,7 +25,7 @@
     <configstring name="openssl_cafile" required="false" desc="The location of
--   the root certificates bundle.">/somewhere/ca-bundle.crt</configstring>
-+   the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
+    the root certificates bundle, e.g. /etc/ssl/certs. See
+    http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for
+-   details."/>
++   details.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
     <configstring name="openssl_binary" required="false" desc="The location of
-    the OpenSSL binary on your system. This program is REQUIRED to import
-    personal S/MIME certificate information, as there is no native PHP function
+    the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is
+    REQUIRED to import personal S/MIME certificate information, as there is no
diff --git a/mail/imp/files/pkg-message.in b/mail/imp/files/pkg-message.in
index 78a666232a4a..1e77290035f9 100644
--- a/mail/imp/files/pkg-message.in
+++ b/mail/imp/files/pkg-message.in
@@ -11,10 +11,8 @@ Then, you might have to tune the configuration files located in
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration. Please read %%DOCSDIR%%/INSTALL.
 
-Warning: the filter system of IMP 3.x has been replaced by a separate
-******** application => check the port mail/ingo. Ingo provides a script
-         to migrate the existing filter rules from IMP 3.x, see Ingo's
-         documentation.
+Warning: if you are upgrading from IMP 4.0.x, please read
+%%DOCSDIR%%/UPGRADING.
 
 To protect your configuration files, you have to restart Apache.
 
diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist
index 5d37825d02a8..a5a551a09a26 100644
--- a/mail/imp/pkg-plist
+++ b/mail/imp/pkg-plist
@@ -13,8 +13,8 @@
 %%IMPDIR%%/config/conf.xml
 %%IMPDIR%%/config/filter.txt
 %%IMPDIR%%/config/filter.txt.dist
-%%IMPDIR%%/config/header.txt
-%%IMPDIR%%/config/header.txt.dist
+%%IMPDIR%%/config/header.php
+%%IMPDIR%%/config/header.php.dist
 %%IMPDIR%%/config/menu.php
 %%IMPDIR%%/config/menu.php.dist
 %%IMPDIR%%/config/mime_drivers.php
@@ -47,6 +47,10 @@
 %%IMPDIR%%/lib/Filter.php
 %%IMPDIR%%/lib/Folder.php
 %%IMPDIR%%/lib/IMAP.php
+%%IMPDIR%%/lib/IMAP/Client.php
+%%IMPDIR%%/lib/IMAP/Search.php
+%%IMPDIR%%/lib/IMAP/Sort.php
+%%IMPDIR%%/lib/IMAP/Thread.php
 %%IMPDIR%%/lib/IMAP/Tree.php
 %%IMPDIR%%/lib/IMP.php
 %%IMPDIR%%/lib/Identity/imp.php
@@ -90,7 +94,6 @@
 %%IMPDIR%%/lib/Search.php
 %%IMPDIR%%/lib/Session.php
 %%IMPDIR%%/lib/Spam.php
-%%IMPDIR%%/lib/VFolder.php
 %%IMPDIR%%/lib/api.php
 %%IMPDIR%%/lib/base.php
 %%IMPDIR%%/lib/prefs.php
@@ -122,6 +125,7 @@
 %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/fr_FR/help.xml
 %%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/he_IL/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/hu_HU/help.xml
 %%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
@@ -129,6 +133,7 @@
 %%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/it_IT/help.xml
 %%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/km_KH/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ko_KR/help.xml
 %%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
@@ -155,6 +160,7 @@
 %%IMPDIR%%/locale/sv_SE/help.xml
 %%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/tr_TR/help.xml
 %%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/uk_UA/help.xml
 %%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
@@ -182,12 +188,14 @@
 %%IMPDIR%%/po/fi_FI.po
 %%IMPDIR%%/po/fr_FR.po
 %%IMPDIR%%/po/gl_ES.po
+%%IMPDIR%%/po/he_IL.po
 %%IMPDIR%%/po/hu_HU.po
 %%IMPDIR%%/po/id_ID.po
 %%IMPDIR%%/po/imp.pot
 %%IMPDIR%%/po/is_IS.po
 %%IMPDIR%%/po/it_IT.po
 %%IMPDIR%%/po/ja_JP.po
+%%IMPDIR%%/po/km_KH.po
 %%IMPDIR%%/po/ko_KR.po
 %%IMPDIR%%/po/lt_LT.po
 %%IMPDIR%%/po/lv_LV.po
@@ -210,13 +218,14 @@
 %%IMPDIR%%/po/zh_TW.po
 %%IMPDIR%%/recompose.php
 %%IMPDIR%%/redirect.php
+%%IMPDIR%%/saveimage.php
 %%IMPDIR%%/scripts/.htaccess
 %%IMPDIR%%/scripts/Imp.reg
 %%IMPDIR%%/scripts/custom_login.php
-%%IMPDIR%%/scripts/singlescript.php
 %%IMPDIR%%/search.php
 %%IMPDIR%%/smime.php
 %%IMPDIR%%/spelling.php
+%%IMPDIR%%/stationery.php
 %%IMPDIR%%/templates/.htaccess
 %%IMPDIR%%/templates/acl/acl.inc
 %%IMPDIR%%/templates/common-header.inc
@@ -246,9 +255,9 @@
 %%IMPDIR%%/templates/folders/foot.inc
 %%IMPDIR%%/templates/folders/head.inc
 %%IMPDIR%%/templates/folders/import.inc
-%%IMPDIR%%/templates/folders/javascript.inc
-%%IMPDIR%%/templates/javascript/open_compose_win.js
-%%IMPDIR%%/templates/javascript/open_print_win.js
+%%IMPDIR%%/templates/javascript/addressesBlocks.js
+%%IMPDIR%%/templates/javascript/folders.js
+%%IMPDIR%%/templates/javascript/popup.js
 %%IMPDIR%%/templates/login/login.inc
 %%IMPDIR%%/templates/mailbox/actions.inc
 %%IMPDIR%%/templates/mailbox/actions_deleted.inc
@@ -272,10 +281,9 @@
 %%IMPDIR%%/templates/message/navbar_top.inc
 %%IMPDIR%%/templates/pgp/import_key.inc
 %%IMPDIR%%/templates/pgp/notactive.inc
-%%IMPDIR%%/templates/pgp/open_pgp_import.js
-%%IMPDIR%%/templates/pgp/open_pgp_win.js
 %%IMPDIR%%/templates/pgp/passphrase.inc
 %%IMPDIR%%/templates/pgp/pgp.inc
+%%IMPDIR%%/templates/prefs/defaultsearchselect.inc
 %%IMPDIR%%/templates/prefs/encryptselect.inc
 %%IMPDIR%%/templates/prefs/folderselect.inc
 %%IMPDIR%%/templates/prefs/initialpageselect.inc
@@ -284,19 +292,17 @@
 %%IMPDIR%%/templates/prefs/spamselect.inc
 %%IMPDIR%%/templates/prefs/trashselect.inc
 %%IMPDIR%%/templates/quota/quota.inc
+%%IMPDIR%%/templates/saveimage/saveimage.inc
 %%IMPDIR%%/templates/search/fields.inc
 %%IMPDIR%%/templates/search/header.inc
 %%IMPDIR%%/templates/search/javascript.inc
 %%IMPDIR%%/templates/search/main.inc
 %%IMPDIR%%/templates/smime/import_key.inc
 %%IMPDIR%%/templates/smime/notactive.inc
-%%IMPDIR%%/templates/smime/open_smime_import.js
-%%IMPDIR%%/templates/smime/open_smime_win.js
 %%IMPDIR%%/templates/smime/passphrase.inc
 %%IMPDIR%%/templates/smime/smime.inc
-%%IMPDIR%%/templates/thread/bottom.inc
+%%IMPDIR%%/templates/stationery/prefs.inc
 %%IMPDIR%%/templates/thread/thread.html
-%%IMPDIR%%/templates/thread/top.inc
 %%IMPDIR%%/test.php
 %%IMPDIR%%/themes/azur/screen.css
 %%IMPDIR%%/themes/bluemoon/screen.css
@@ -306,11 +312,13 @@
 %%IMPDIR%%/themes/cherry/screen.css
 %%IMPDIR%%/themes/cornflower/screen.css
 %%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/graphics/addressbook-blue.png
-%%IMPDIR%%/themes/graphics/addressbook-red.png
+%%IMPDIR%%/themes/graphics/addressbook_add.png
+%%IMPDIR%%/themes/graphics/addressbook_browse.png
 %%IMPDIR%%/themes/graphics/apple.png
 %%IMPDIR%%/themes/graphics/attachment.png
+%%IMPDIR%%/themes/graphics/audio/theetone.wav
 %%IMPDIR%%/themes/graphics/compose.png
+%%IMPDIR%%/themes/graphics/empty_spam.png
 %%IMPDIR%%/themes/graphics/empty_trash.png
 %%IMPDIR%%/themes/graphics/encrypted.png
 %%IMPDIR%%/themes/graphics/expand.png
@@ -322,14 +330,13 @@
 %%IMPDIR%%/themes/graphics/folders/folder_open.png
 %%IMPDIR%%/themes/graphics/folders/inbox.png
 %%IMPDIR%%/themes/graphics/folders/sent.png
-%%IMPDIR%%/themes/graphics/folders/templates.png
 %%IMPDIR%%/themes/graphics/folders/trash.png
-%%IMPDIR%%/themes/graphics/forward.png
 %%IMPDIR%%/themes/graphics/imp.png
 %%IMPDIR%%/themes/graphics/mail_answered.png
 %%IMPDIR%%/themes/graphics/mail_deleted.png
 %%IMPDIR%%/themes/graphics/mail_draft.png
 %%IMPDIR%%/themes/graphics/mail_flagged.png
+%%IMPDIR%%/themes/graphics/mail_forwarded.png
 %%IMPDIR%%/themes/graphics/mail_personal.png
 %%IMPDIR%%/themes/graphics/mail_priority_high.png
 %%IMPDIR%%/themes/graphics/mail_priority_low.png
@@ -344,7 +351,6 @@
 %%IMPDIR%%/themes/graphics/mime/mail.png
 %%IMPDIR%%/themes/graphics/mime/text.png
 %%IMPDIR%%/themes/graphics/newmail.png
-%%IMPDIR%%/themes/graphics/reply.png
 %%IMPDIR%%/themes/graphics/shared.png
 %%IMPDIR%%/themes/graphics/signed.png
 %%IMPDIR%%/themes/graphics/spacer_red.png
@@ -355,6 +361,7 @@
 %%IMPDIR%%/themes/luc/screen.css
 %%IMPDIR%%/themes/lucblue/screen.css
 %%IMPDIR%%/themes/postnuke/screen.css
+%%IMPDIR%%/themes/rtl/screen.css
 %%IMPDIR%%/themes/screen.css
 %%IMPDIR%%/themes/simplex/screen.css
 %%IMPDIR%%/themes/sun/screen.css
@@ -364,12 +371,14 @@
 %%HORDE_INC%%httpd-imp.conf
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
+@dirrm %%IMPDIR%%/themes/rtl
 @dirrm %%IMPDIR%%/themes/postnuke
 @dirrm %%IMPDIR%%/themes/lucblue
 @dirrm %%IMPDIR%%/themes/luc
 @dirrm %%IMPDIR%%/themes/lavander
 @dirrm %%IMPDIR%%/themes/graphics/mime
 @dirrm %%IMPDIR%%/themes/graphics/folders
+@dirrm %%IMPDIR%%/themes/graphics/audio
 @dirrm %%IMPDIR%%/themes/graphics
 @dirrm %%IMPDIR%%/themes/grey
 @dirrm %%IMPDIR%%/themes/green
@@ -383,8 +392,10 @@
 @dirrm %%IMPDIR%%/themes/azur
 @dirrm %%IMPDIR%%/themes
 @dirrm %%IMPDIR%%/templates/thread
+@dirrm %%IMPDIR%%/templates/stationery
 @dirrm %%IMPDIR%%/templates/smime
 @dirrm %%IMPDIR%%/templates/search
+@dirrm %%IMPDIR%%/templates/saveimage
 @dirrm %%IMPDIR%%/templates/quota
 @dirrm %%IMPDIR%%/templates/prefs
 @dirrm %%IMPDIR%%/templates/pgp
@@ -441,6 +452,8 @@
 @dirrm %%IMPDIR%%/locale/lt_LT
 @dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ko_KR
+@dirrm %%IMPDIR%%/locale/km_KH/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/km_KH
 @dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ja_JP
 @dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -451,6 +464,8 @@
 @dirrm %%IMPDIR%%/locale/id_ID
 @dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/hu_HU
+@dirrm %%IMPDIR%%/locale/he_IL/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/he_IL
 @dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/gl_ES
 @dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in
deleted file mode 100644
index 15524546d05d..000000000000
--- a/mail/milter-greylist/files/milter-greylist.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: miltergreylist
-# REQUIRE: LOGIN
-# BEFORE: sendmail
-# KEYWORD: milter-greylist
-
-# Define these miltergreylist_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/miltergreylist
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-
-. %%RC_SUBR%%
-
-name="miltergreylist"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-miltergreylist_enable=${miltergreylist_enable-"NO"}
-miltergreylist_runas=${miltergreylist_runas-"smmsp"}
-miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
-miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
-miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
-miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
--f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
-
-command="%%PREFIX%%/bin/milter-greylist"
-
-run_rc_command "$1"
diff --git a/mail/milter-greylist/files/pkg-message.in b/mail/milter-greylist/files/pkg-message.in
deleted file mode 100644
index 398094ce4230..000000000000
--- a/mail/milter-greylist/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-===> IMPORTANT NOTE
-
-     A sample configuration file has been installed in ${PREFIX}/etc/mail
-     directory. Copy and edit it to suit your needs before launching
-     milter-greylist.
-
-     To run milter-greylist from startup, add miltergreylist_enable="YES"
-     in your /etc/rc.conf or your /etc/rc.conf.local
-
-     See ${DOCSDIR}/README for operation details.
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
deleted file mode 100644
index 4dc64607a688..000000000000
--- a/mail/mutt14/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:  mutt w/pgp hooks
-# Date created:			  Thur July 25, 1996
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mutt
-PORTVERSION=	1.4.2.1
-PORTREVISION=	2
-CATEGORIES+=	mail ipv6
-MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
-		ftp://ftp.parodius.com/pub/mutt/
-DISTFILES=	${DISTNAME}i${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
-		http://www2.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
-		http://www3.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
-		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \
-		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv
-PATCHFILES=	patch-${PORTVERSION}.rr.compressed.gz:vvv \
-		patch-${PORTVERSION}.vvv.initials.gz:vvv
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	udo.schweigert@siemens.com
-COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
-
-CONFLICTS=	mutt-devel-*
-
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
-WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell \
-		urlview:${PORTSDIR}/textproc/urlview
-.endif
-.if defined (MUTT_LITE)
-PKGNAMESUFFIX=	-lite
-WITH_SGML_DOCS:=no
-.elif ${MACHINE_ARCH} != "alpha"
-#  coredump in sgmls
-WITH_SGML_DOCS?=yes
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-USE_ICONV=	yes
-.if defined(WITHOUT_MUTT_ICONV)
-.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
-	WITHOUT_NLS is also given
-.endif
-.elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV=	yes
-.endif
-
-.if defined(WITH_SLANG)
-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-.if !defined (MUTT_LITE)
-.if defined(WITH_MUTT_CYRUS_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-.endif
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-.if defined(WITH_MUTT_XFACE)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
-RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
-.endif
-.endif
-
-DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
-USE_REINPLACE=	yes
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
-		--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${DOCSDIR} --with-charmaps \
-		--enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
-.endif
-.if defined(WITHOUT_MUTT_FLOCK)
-CONFIGURE_ARGS+=	--disable-flock
-.else
-CONFIGURE_ARGS+=	--enable-flock
-.endif
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
-.endif
-.if defined(WITHOUT_MUTT_ICONV) && defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-iconv
-.else
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
-.endif
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
-.endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-.endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		mbox.5 muttrc.5
-
-post-patch::
-	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
-		${WRKSRC}/contrib/gpg.rc
-	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
-		${WRKSRC}/contrib/pgp6.rc
-	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
-		${WRKSRC}/contrib/Makefile.in
-
-.if defined(WITH_MUTT_XFACE)
-post-patch::
-	@${ECHO} "===>  Applying XFACE patch"
-	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
-			-name slrnface-\*`; \
-	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
-.endif
-
-pre-configure::
-	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
-
-# XXX
-# this should be done automagically by aclocal but ....
-# for now, this will have to do
-pre-build:
-	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
-			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
-			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
-			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
-		${BUILD_WRKSRC}/Makefile
-
-.if !defined(NOPORTDOCS)
-post-build:
-	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
-	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
-		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
-		${WRKSRC}/doc/mutt.man
-	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
-		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
-		${WRKSRC}/doc/muttrc.man
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
-	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
-.endif
-.endif
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
-.if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${DOCSDIR}
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
-	    -d ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR}
-.endif
-.endif
-
-.if defined(WITH_MUTT_XFACE)
-	@${ECHO} ""
-	@${ECHO} "************************************************************"
-	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
-	@${ECHO} "        set xface=yes"
-	@${ECHO} "  to your ~/.muttrc"
-	@${ECHO} "  Additional information is provided by news/slrnface"
-	@${ECHO} "************************************************************"
-	@${ECHO} ""
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
deleted file mode 100644
index 0bd432e2d1a3..000000000000
--- a/mail/mutt14/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (mutt/mutt-1.4.2.1i.tar.gz) = 710bd56d3c4c4bcd1403bc4e053f7476
-SHA256 (mutt/mutt-1.4.2.1i.tar.gz) = ff2cb647ece6c85842bb42943774b434f0059267a0cd55922e95b32202cb66d5
-SIZE (mutt/mutt-1.4.2.1i.tar.gz) = 2611253
-MD5 (mutt/patch-1.4.2.1.rr.compressed.gz) = d73694d88089c32e051b0682ab3bca15
-SHA256 (mutt/patch-1.4.2.1.rr.compressed.gz) = e1603586a359b73f9df614d0b8485689845cb370cbf0775192821dbb6c33a98b
-SIZE (mutt/patch-1.4.2.1.rr.compressed.gz) = 10125
-MD5 (mutt/patch-1.4.2.1.vvv.initials.gz) = fd5cca0c29b4e0fb4cf56cec023a5ab6
-SHA256 (mutt/patch-1.4.2.1.vvv.initials.gz) = ba396d6870922e469a1d22a4e061b342ce058340a7de73950ab6240075207060
-SIZE (mutt/patch-1.4.2.1.vvv.initials.gz) = 686
diff --git a/mail/mutt14/files/extra-patch-doc-ref b/mail/mutt14/files/extra-patch-doc-ref
deleted file mode 100644
index 99222e0bceb0..000000000000
--- a/mail/mutt14/files/extra-patch-doc-ref
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
--and a threaded sorting mode.
-+and a threaded sorting mode.  Details of how to use all of this is
-+available in \fI${DOCSDIR}\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
deleted file mode 100644
index 3717189e334f..000000000000
--- a/mail/mutt14/files/patch-02
+++ /dev/null
@@ -1,63 +0,0 @@
---- doc/Makefile.in.orig	Tue Nov  6 11:12:31 2001
-+++ doc/Makefile.in	Fri Jun 21 12:00:28 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: muttrc.man try-html try-txt
-+all: muttrc.man try-html try-txt try-latin1
- 
- try-html: ../makedoc
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
- 
- install: all instdoc
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -86,10 +92,10 @@
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	for file in manual*.html ; do	\
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
-+	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-+	# for file in manual*.html ; do	\
-+	# 	$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-+	# done
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -99,14 +105,18 @@
- 
- check:
- manual.txt: manual.sgml
--	if sgml2txt -c latin manual ; then \
--		uniq < manual.txt | expand > _manual.txt ; \
--		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
- 
- manual.html: manual.sgml
--	sgml2html manual  || true
-+	@# sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
- 
- manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
deleted file mode 100644
index b870f7f7aaec..000000000000
--- a/mail/mutt14/files/patch-03
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/manual.sgml.orig	Tue May  9 17:15:26 2000
-+++ doc/manual.sgml	Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
--<!doctype linuxdoc system>
--
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot "&#34;">
-+]>
-+<linuxdoc>
-+  
- <article>
- 
- <title>The Mutt E-Mail Client
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 13a52d9daa40..000000000000
--- a/mail/mutt14/files/patch-05
+++ /dev/null
@@ -1,87 +0,0 @@
---- curs_lib.c.old	Wed Sep  1 19:39:20 1999
-+++ curs_lib.c	Sun Sep 26 23:47:03 1999
-@@ -156,6 +156,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
-@@ -413,8 +423,9 @@
- {
-   event_t ch;
-   int choice;
--  char *p;
-+  char *p, *nletters;
- 
-+  nletters = _(letters);
-   mvaddstr (LINES - 1, 0, prompt);
-   clrtoeol ();
-   FOREVER
-@@ -428,6 +439,12 @@
-     }
-     else
-     {
-+      p = strchr (nletters, ch.ch);
-+      if (p)
-+      {
-+	choice = p - nletters + 1;
-+	break;
-+      }
-       p = strchr (letters, ch.ch);
-       if (p)
-       {
---- browser.c.orig	Fri Sep 24 01:08:08 1999
-+++ browser.c	Sun Sep 26 23:46:25 1999
-@@ -750,7 +750,7 @@
- 	  switch (mutt_multi_choice ((reverse) ?
- 	      _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
- 	      _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
--	      _("dazn")))
-+	      N_("dazn")))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.orig	Wed Jul  7 02:56:24 1999
-+++ commands.c	Sun Sep 26 23:46:25 1999
-@@ -337,7 +337,7 @@
-   switch (mutt_multi_choice (reverse ?
- 			     _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
- 			     _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
--			     _("dfrsotuzc")))
-+			     N_("dfrsotuzc")))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.orig	Mon Feb 12 18:02:38 2001
-+++ compose.c	Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
-   char input_signas[SHORT_STRING];
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
--			     _("esabf")))
-+			     N_("esabf")))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- muttlib.c.orig	Sun Apr  9 14:39:02 2000
-+++ muttlib.c	Fri May 12 11:26:58 2000
-@@ -671,7 +671,7 @@
-   if (*append == 0 && access (fname, F_OK) == 0)
-   {
-     switch (mutt_multi_choice
--	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
-+	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08
deleted file mode 100644
index 3e50cbd13779..000000000000
--- a/mail/mutt14/files/patch-08
+++ /dev/null
@@ -1,10 +0,0 @@
---- Muttrc.orig	Sat May 13 08:30:44 2000
-+++ Muttrc	Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- # 
-+set followup_to=no
- # 
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail.  When set, Mutt will generate this
diff --git a/mail/mutt14/files/patch-aclocal.m4 b/mail/mutt14/files/patch-aclocal.m4
deleted file mode 100644
index 6635a1a90fa6..000000000000
--- a/mail/mutt14/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Fri Jul 28 11:50:25 2000
-+++ aclocal.m4	Wed Dec  5 12:10:16 2001
-@@ -62,4 +62,4 @@
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir)
diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in
deleted file mode 100644
index 0b37933c1c62..000000000000
--- a/mail/mutt14/files/patch-configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	Mon Nov 11 14:11:26 2002
-+++ configure.in	Mon Nov 11 14:12:09 2002
-@@ -515,7 +515,7 @@
-            AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
-           fi
- 
--          if test "$with_ssl" != "yes"
-+          if test "$with_ssl" != "yes" && x$withval != x/usr
-           then
-            LDFLAGS="$LDFLAGS -L$withval/lib"
-            CPPFLAGS="$CPPFLAGS -I$withval/include"
-@@ -572,7 +572,7 @@
-         then
-           if test "$with_sasl" != "yes"
-           then
--            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
-             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
-           fi
- 
-@@ -625,7 +625,7 @@
- fi])
- 
- if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
--        CFLAGS="-Wall -pedantic $CFLAGS"
-+        CFLAGS="-Wall $CFLAGS"
- fi
- 
- AC_ARG_ENABLE(nfs-fix, [  --enable-nfs-fix           Work around an NFS with broken attributes caching ],
diff --git a/mail/mutt14/files/patch-contrib-Makefile.in b/mail/mutt14/files/patch-contrib-Makefile.in
deleted file mode 100644
index 71e216bd607c..000000000000
--- a/mail/mutt14/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Mon Mar 21 08:12:59 2005
-@@ -20,7 +20,7 @@
- 
- subdir = contrib
- 
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr
- 
- DISTFILES = Makefile.in language.txt language50.txt  \
diff --git a/mail/mutt14/files/patch-doc-mutt.man b/mail/mutt14/files/patch-doc-mutt.man
deleted file mode 100644
index 46e086721a76..000000000000
--- a/mail/mutt14/files/patch-doc-mutt.man
+++ /dev/null
@@ -1,34 +0,0 @@
---- doc/mutt.man.orig	Wed Jul 24 10:41:31 2002
-+++ doc/mutt.man	Sun Oct 26 11:06:36 2003
-@@ -136,9 +136,9 @@
- User's personal mapping between MIME types and file extensions.
- .IP "/etc/mime.types"
- System mapping between MIME types and file extensions.
--.IP "/usr/local/bin/mutt_dotlock"
-+.IP "${PREFIX}/bin/mutt_dotlock"
- The privileged dotlocking program.
--.IP "/usr/local/doc/mutt/manual.txt"
-+.IP "${DOCSDIR}/manual.txt"
- The Mutt manual.
- .SH BUGS
- .PP
---- doc/muttrc.man	Sun Oct 26 11:09:09 2003
-+++ doc/muttrc.man	Sun Oct 26 11:08:48 2003
-@@ -990,7 +972,7 @@
- .B dotlock_program
- .nf
- Type: path
--Default: \(lq/usr/local/bin/mutt_dotlock\(rq
-+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
- .fi
- .IP
- Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -3970,7 +3952,7 @@
- instead of a raw socket. You may be able to use this to set up
- preauthenticated connections to your IMAP/POP3 server. Example:
- .IP
--tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
-+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
- .IP
- NOTE: For this example to work you must be able to log in to the remote
- machine without having to enter a password.
diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples
deleted file mode 100644
index 2d24771033f7..000000000000
--- a/mail/mutt14/files/patch-examples
+++ /dev/null
@@ -1,50 +0,0 @@
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+samplesdir = @samplesdir@
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@
- check:
- 
- install:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
- 	for f in $(SAMPLES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
- 	done
- 	for f in $(srcdir)/iconv/*.rc ; do					\
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
- 	done
- 
- # Nothing needs to be done - uninstall in doc removes samples as well.
---- init.h.orig	Wed Mar 26 11:50:36 2003
-+++ init.h	Wed Mar 26 12:54:37 2003
-@@ -1347,8 +1347,8 @@
-   ** .pp
-   ** For examples on how to configure these formats for the various versions
-   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
--  ** the samples/ subdirectory which has been installed on your system
--  ** alongside the documentation.
-+  ** the share/examples/mutt subdirectory which has been installed on your
-+  ** system.
-   */
-   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
-   /*
---- Makefile.am.orig	Wed Mar 26 13:13:10 2003
-+++ Makefile.am	Wed Mar 26 13:25:40 2003
-@@ -13,7 +13,7 @@
- 
- bin_SCRIPTS = muttbug flea
- 
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c
deleted file mode 100644
index 389b682cfa11..000000000000
--- a/mail/mutt14/files/patch-init.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- init.c.orig	Wed Jul 24 10:41:29 2002
-+++ init.c	Sat May  3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
-   struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+  char nodename[STRING];
-+#else
-   struct utsname utsname;
-+#endif
-   char *p, buffer[STRING], error[STRING];
-   int i, default_rc = 0, need_pause = 0;
-   BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
- 
-   /* And about the host... */
-+#if __FreeBSD_version < 500000
-+  gethostname(nodename, sizeof (nodename));
-+#else
-   uname (&utsname);
-+  strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
-   /* some systems report the FQDN instead of just the hostname */
--  if ((p = strchr (utsname.nodename, '.')))
-+  if ((p = strchr (nodename, '.')))
-   {
--    Hostname = mutt_substrdup (utsname.nodename, p);
-+    Hostname = mutt_substrdup (nodename, p);
-     p++;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-   else
--    Hostname = safe_strdup (utsname.nodename);
-+    Hostname = safe_strdup (nodename);
- 
- #ifndef DOMAIN
- #define DOMAIN buffer
diff --git a/mail/mutt14/files/patch-mktemp b/mail/mutt14/files/patch-mktemp
deleted file mode 100644
index 8fc82de528d7..000000000000
--- a/mail/mutt14/files/patch-mktemp
+++ /dev/null
@@ -1,15 +0,0 @@
---- muttlib.c.orig	Fri May  7 17:30:35 2004
-+++ muttlib.c	Fri May  7 17:32:13 2004
-@@ -656,7 +656,11 @@
- 
- void mutt_mktemp (char *s)
- {
--  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
-+  char t[7];
-+  snprintf (t, 7, "-%05d", Counter++);
-+  snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
-+  mktemp (s);
-+  strncat(s, t, 6);
-   unlink (s);
- }
- 
diff --git a/mail/mutt14/files/patch-threadcomplete b/mail/mutt14/files/patch-threadcomplete
deleted file mode 100644
index e4f56f261382..000000000000
--- a/mail/mutt14/files/patch-threadcomplete
+++ /dev/null
@@ -1,73 +0,0 @@
-written by Nicolas Rachinsky <nr@rachinsky.de>
-http://www.rachinsky.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation;  version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
---- mutt-1.3.28.ori/mutt.h	Thu Mar 14 19:22:25 2002
-+++ mutt.h	Fri Mar 15 00:22:41 2002
-@@ -198,6 +198,7 @@
-   M_LIMIT,
-   M_EXPIRED,
-   M_SUPERSEDED,
-+  M_THREADCOMPLETE,
- 
-   /* actions for mutt_pattern_comp/mutt_pattern_exec */
-   M_AND,
---- mutt-1.3.28.ori/pattern.c	Thu Mar 14 19:22:26 2002
-+++ pattern.c	Fri Mar 15 00:23:52 2002
-@@ -50,6 +50,7 @@
- }
- Flags[] =
- {
-+  { 'a', M_THREADCOMPLETE,	0,		NULL },
-   { 'A', M_ALL,			0,		NULL },
-   { 'b', M_BODY,		M_FULL_MSG,	eat_regexp },
-   { 'B', M_WHOLE_MSG,		M_FULL_MSG,	eat_regexp },
-@@ -957,6 +958,27 @@
-   return alladdr;
- }
- 
-+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down)
-+{
-+	int a=0;
-+	HEADER *h=NULL;
-+
-+	if(! t)return 0;
-+	h=t->message;
-+	if(! flag && h && h->tagged)return 1;
-+	if(flag && h && ! h->tagged) return 1;
-+
-+	if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0);
-+	if(a)return a;
-+	if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1);
-+	if(a)return a;
-+	if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1);
-+	if(a)return a;
-+	if(down)a=match_threadcomplete(flag,t->child,1,0,1,1);
-+	if(a)return a;
-+	return 0;
-+}
-+
- /* flags
-    	M_MATCH_FULL_ADDRESS	match both personal and machine address */
- int
-@@ -1053,6 +1075,8 @@
-       return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0));
-     case M_DUPLICATED:
-       return (pat->not ^ (h->thread && h->thread->duplicate_thread));
-+    case M_THREADCOMPLETE:
-+      return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1)));
-   }
-   mutt_error (_("error: unknown op %d (report this error)."), pat->op);
-   return (-1);
---- PATCHES~    Tue Nov  6 19:59:33 2001
-+++ PATCHES     Tue Nov  6 19:59:42 2001
-@@ -1,0 +1 @@
-+1.3.28.nr.threadcomplete
diff --git a/mail/mutt14/files/patch-z b/mail/mutt14/files/patch-z
deleted file mode 100644
index 08a7dfbebe7b..000000000000
--- a/mail/mutt14/files/patch-z
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig2	Thu Jan  6 15:45:58 2005
-+++ Makefile.am	Thu Jan  6 15:47:48 2005
-@@ -11,7 +11,7 @@
- 
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
- 
--bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS =
- 
- BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
---- doc/Makefile.in.orig2	Thu Jan  6 15:45:57 2005
-+++ doc/Makefile.in	Thu Jan  6 15:53:52 2005
-@@ -78,8 +78,6 @@
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
--	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
--	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
- 	./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
diff --git a/mail/mutt14/pkg-descr b/mail/mutt14/pkg-descr
deleted file mode 100644
index 68d853aebed8..000000000000
--- a/mail/mutt14/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Mutt -- "The Mongrel of Mail User Agents" (part Elm, part Pine, part mh,
-part slrn, part everything else) is an interactive screen-oriented mailer
-program that supersedes Elm, Pine, mail and mailx.
-
-Features include color support, message threading, MIME support (including
-RFC1522 support for encoded headers), customizable key bindings, POP3,
-Delivery Status Notification (DSN) support, and PGP/MIME.
-
-WWW: http://www.mutt.org/
-Mutt User Information:	http://www.math.fu-berlin.de/~guckes/mutt/
-
-	-- David	(obrien@cs.ucdavis.edu)
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
deleted file mode 100644
index 28f0c9f55b73..000000000000
--- a/mail/mutt14/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-@comment $FreeBSD$
-bin/mutt
-bin/mutt_dotlock
-bin/pgpewrap
-bin/pgpring
-@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
-etc/Muttrc.dist
-@exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/patch-notes.txt
-%%EXAMPLESDIR%%/Mush.rc
-%%EXAMPLESDIR%%/Pine.rc
-%%EXAMPLESDIR%%/Tin.rc
-%%EXAMPLESDIR%%/gpg.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
-%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
-%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
-%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm %%EXAMPLESDIR%%/iconv
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
deleted file mode 100644
index 60d2e6956e83..000000000000
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ /dev/null
@@ -1,346 +0,0 @@
-%%DOCSDIR%%/html/manual.html
-%%DOCSDIR%%/html/manual1.html
-%%DOCSDIR%%/html/manual10.html
-%%DOCSDIR%%/html/manual100.html
-%%DOCSDIR%%/html/manual101.html
-%%DOCSDIR%%/html/manual102.html
-%%DOCSDIR%%/html/manual103.html
-%%DOCSDIR%%/html/manual104.html
-%%DOCSDIR%%/html/manual105.html
-%%DOCSDIR%%/html/manual106.html
-%%DOCSDIR%%/html/manual107.html
-%%DOCSDIR%%/html/manual108.html
-%%DOCSDIR%%/html/manual109.html
-%%DOCSDIR%%/html/manual11.html
-%%DOCSDIR%%/html/manual110.html
-%%DOCSDIR%%/html/manual111.html
-%%DOCSDIR%%/html/manual112.html
-%%DOCSDIR%%/html/manual113.html
-%%DOCSDIR%%/html/manual114.html
-%%DOCSDIR%%/html/manual115.html
-%%DOCSDIR%%/html/manual116.html
-%%DOCSDIR%%/html/manual117.html
-%%DOCSDIR%%/html/manual118.html
-%%DOCSDIR%%/html/manual119.html
-%%DOCSDIR%%/html/manual12.html
-%%DOCSDIR%%/html/manual120.html
-%%DOCSDIR%%/html/manual121.html
-%%DOCSDIR%%/html/manual122.html
-%%DOCSDIR%%/html/manual123.html
-%%DOCSDIR%%/html/manual124.html
-%%DOCSDIR%%/html/manual125.html
-%%DOCSDIR%%/html/manual126.html
-%%DOCSDIR%%/html/manual127.html
-%%DOCSDIR%%/html/manual128.html
-%%DOCSDIR%%/html/manual129.html
-%%DOCSDIR%%/html/manual13.html
-%%DOCSDIR%%/html/manual130.html
-%%DOCSDIR%%/html/manual131.html
-%%DOCSDIR%%/html/manual132.html
-%%DOCSDIR%%/html/manual133.html
-%%DOCSDIR%%/html/manual134.html
-%%DOCSDIR%%/html/manual135.html
-%%DOCSDIR%%/html/manual136.html
-%%DOCSDIR%%/html/manual137.html
-%%DOCSDIR%%/html/manual138.html
-%%DOCSDIR%%/html/manual139.html
-%%DOCSDIR%%/html/manual14.html
-%%DOCSDIR%%/html/manual140.html
-%%DOCSDIR%%/html/manual141.html
-%%DOCSDIR%%/html/manual142.html
-%%DOCSDIR%%/html/manual143.html
-%%DOCSDIR%%/html/manual144.html
-%%DOCSDIR%%/html/manual145.html
-%%DOCSDIR%%/html/manual146.html
-%%DOCSDIR%%/html/manual147.html
-%%DOCSDIR%%/html/manual148.html
-%%DOCSDIR%%/html/manual149.html
-%%DOCSDIR%%/html/manual15.html
-%%DOCSDIR%%/html/manual150.html
-%%DOCSDIR%%/html/manual151.html
-%%DOCSDIR%%/html/manual152.html
-%%DOCSDIR%%/html/manual153.html
-%%DOCSDIR%%/html/manual154.html
-%%DOCSDIR%%/html/manual155.html
-%%DOCSDIR%%/html/manual156.html
-%%DOCSDIR%%/html/manual157.html
-%%DOCSDIR%%/html/manual158.html
-%%DOCSDIR%%/html/manual159.html
-%%DOCSDIR%%/html/manual16.html
-%%DOCSDIR%%/html/manual160.html
-%%DOCSDIR%%/html/manual161.html
-%%DOCSDIR%%/html/manual162.html
-%%DOCSDIR%%/html/manual163.html
-%%DOCSDIR%%/html/manual164.html
-%%DOCSDIR%%/html/manual165.html
-%%DOCSDIR%%/html/manual166.html
-%%DOCSDIR%%/html/manual167.html
-%%DOCSDIR%%/html/manual168.html
-%%DOCSDIR%%/html/manual169.html
-%%DOCSDIR%%/html/manual17.html
-%%DOCSDIR%%/html/manual170.html
-%%DOCSDIR%%/html/manual171.html
-%%DOCSDIR%%/html/manual172.html
-%%DOCSDIR%%/html/manual173.html
-%%DOCSDIR%%/html/manual174.html
-%%DOCSDIR%%/html/manual175.html
-%%DOCSDIR%%/html/manual176.html
-%%DOCSDIR%%/html/manual177.html
-%%DOCSDIR%%/html/manual178.html
-%%DOCSDIR%%/html/manual179.html
-%%DOCSDIR%%/html/manual18.html
-%%DOCSDIR%%/html/manual180.html
-%%DOCSDIR%%/html/manual181.html
-%%DOCSDIR%%/html/manual182.html
-%%DOCSDIR%%/html/manual183.html
-%%DOCSDIR%%/html/manual184.html
-%%DOCSDIR%%/html/manual185.html
-%%DOCSDIR%%/html/manual186.html
-%%DOCSDIR%%/html/manual187.html
-%%DOCSDIR%%/html/manual188.html
-%%DOCSDIR%%/html/manual189.html
-%%DOCSDIR%%/html/manual19.html
-%%DOCSDIR%%/html/manual190.html
-%%DOCSDIR%%/html/manual191.html
-%%DOCSDIR%%/html/manual192.html
-%%DOCSDIR%%/html/manual193.html
-%%DOCSDIR%%/html/manual194.html
-%%DOCSDIR%%/html/manual195.html
-%%DOCSDIR%%/html/manual196.html
-%%DOCSDIR%%/html/manual197.html
-%%DOCSDIR%%/html/manual198.html
-%%DOCSDIR%%/html/manual199.html
-%%DOCSDIR%%/html/manual2.html
-%%DOCSDIR%%/html/manual20.html
-%%DOCSDIR%%/html/manual200.html
-%%DOCSDIR%%/html/manual201.html
-%%DOCSDIR%%/html/manual202.html
-%%DOCSDIR%%/html/manual203.html
-%%DOCSDIR%%/html/manual204.html
-%%DOCSDIR%%/html/manual205.html
-%%DOCSDIR%%/html/manual206.html
-%%DOCSDIR%%/html/manual207.html
-%%DOCSDIR%%/html/manual208.html
-%%DOCSDIR%%/html/manual209.html
-%%DOCSDIR%%/html/manual21.html
-%%DOCSDIR%%/html/manual210.html
-%%DOCSDIR%%/html/manual211.html
-%%DOCSDIR%%/html/manual212.html
-%%DOCSDIR%%/html/manual213.html
-%%DOCSDIR%%/html/manual214.html
-%%DOCSDIR%%/html/manual215.html
-%%DOCSDIR%%/html/manual216.html
-%%DOCSDIR%%/html/manual217.html
-%%DOCSDIR%%/html/manual218.html
-%%DOCSDIR%%/html/manual219.html
-%%DOCSDIR%%/html/manual22.html
-%%DOCSDIR%%/html/manual220.html
-%%DOCSDIR%%/html/manual221.html
-%%DOCSDIR%%/html/manual222.html
-%%DOCSDIR%%/html/manual223.html
-%%DOCSDIR%%/html/manual224.html
-%%DOCSDIR%%/html/manual225.html
-%%DOCSDIR%%/html/manual226.html
-%%DOCSDIR%%/html/manual227.html
-%%DOCSDIR%%/html/manual228.html
-%%DOCSDIR%%/html/manual229.html
-%%DOCSDIR%%/html/manual23.html
-%%DOCSDIR%%/html/manual230.html
-%%DOCSDIR%%/html/manual231.html
-%%DOCSDIR%%/html/manual232.html
-%%DOCSDIR%%/html/manual233.html
-%%DOCSDIR%%/html/manual234.html
-%%DOCSDIR%%/html/manual235.html
-%%DOCSDIR%%/html/manual236.html
-%%DOCSDIR%%/html/manual237.html
-%%DOCSDIR%%/html/manual238.html
-%%DOCSDIR%%/html/manual239.html
-%%DOCSDIR%%/html/manual24.html
-%%DOCSDIR%%/html/manual240.html
-%%DOCSDIR%%/html/manual241.html
-%%DOCSDIR%%/html/manual242.html
-%%DOCSDIR%%/html/manual243.html
-%%DOCSDIR%%/html/manual244.html
-%%DOCSDIR%%/html/manual245.html
-%%DOCSDIR%%/html/manual246.html
-%%DOCSDIR%%/html/manual247.html
-%%DOCSDIR%%/html/manual248.html
-%%DOCSDIR%%/html/manual249.html
-%%DOCSDIR%%/html/manual25.html
-%%DOCSDIR%%/html/manual250.html
-%%DOCSDIR%%/html/manual251.html
-%%DOCSDIR%%/html/manual252.html
-%%DOCSDIR%%/html/manual253.html
-%%DOCSDIR%%/html/manual254.html
-%%DOCSDIR%%/html/manual255.html
-%%DOCSDIR%%/html/manual256.html
-%%DOCSDIR%%/html/manual257.html
-%%DOCSDIR%%/html/manual258.html             
-%%DOCSDIR%%/html/manual259.html             
-%%DOCSDIR%%/html/manual26.html
-%%DOCSDIR%%/html/manual260.html
-%%DOCSDIR%%/html/manual261.html
-%%DOCSDIR%%/html/manual262.html
-%%DOCSDIR%%/html/manual263.html
-%%DOCSDIR%%/html/manual264.html
-%%DOCSDIR%%/html/manual265.html
-%%DOCSDIR%%/html/manual266.html
-%%DOCSDIR%%/html/manual267.html
-%%DOCSDIR%%/html/manual268.html
-%%DOCSDIR%%/html/manual269.html
-%%DOCSDIR%%/html/manual27.html
-%%DOCSDIR%%/html/manual270.html
-%%DOCSDIR%%/html/manual271.html
-%%DOCSDIR%%/html/manual272.html
-%%DOCSDIR%%/html/manual273.html
-%%DOCSDIR%%/html/manual274.html
-%%DOCSDIR%%/html/manual275.html
-%%DOCSDIR%%/html/manual276.html
-%%DOCSDIR%%/html/manual277.html
-%%DOCSDIR%%/html/manual278.html
-%%DOCSDIR%%/html/manual279.html
-%%DOCSDIR%%/html/manual28.html
-%%DOCSDIR%%/html/manual280.html
-%%DOCSDIR%%/html/manual281.html
-%%DOCSDIR%%/html/manual282.html
-%%DOCSDIR%%/html/manual283.html
-%%DOCSDIR%%/html/manual284.html
-%%DOCSDIR%%/html/manual285.html
-%%DOCSDIR%%/html/manual286.html
-%%DOCSDIR%%/html/manual287.html
-%%DOCSDIR%%/html/manual288.html
-%%DOCSDIR%%/html/manual289.html
-%%DOCSDIR%%/html/manual29.html
-%%DOCSDIR%%/html/manual290.html
-%%DOCSDIR%%/html/manual291.html
-%%DOCSDIR%%/html/manual292.html
-%%DOCSDIR%%/html/manual293.html
-%%DOCSDIR%%/html/manual294.html
-%%DOCSDIR%%/html/manual295.html
-%%DOCSDIR%%/html/manual296.html
-%%DOCSDIR%%/html/manual297.html
-%%DOCSDIR%%/html/manual298.html
-%%DOCSDIR%%/html/manual299.html
-%%DOCSDIR%%/html/manual3.html
-%%DOCSDIR%%/html/manual30.html
-%%DOCSDIR%%/html/manual300.html
-%%DOCSDIR%%/html/manual301.html
-%%DOCSDIR%%/html/manual302.html
-%%DOCSDIR%%/html/manual303.html
-%%DOCSDIR%%/html/manual304.html
-%%DOCSDIR%%/html/manual305.html
-%%DOCSDIR%%/html/manual306.html
-%%DOCSDIR%%/html/manual307.html
-%%DOCSDIR%%/html/manual308.html
-%%DOCSDIR%%/html/manual309.html
-%%DOCSDIR%%/html/manual31.html
-%%DOCSDIR%%/html/manual310.html
-%%DOCSDIR%%/html/manual311.html
-%%DOCSDIR%%/html/manual312.html
-%%DOCSDIR%%/html/manual313.html
-%%DOCSDIR%%/html/manual314.html
-%%DOCSDIR%%/html/manual315.html
-%%DOCSDIR%%/html/manual316.html
-%%DOCSDIR%%/html/manual317.html
-%%DOCSDIR%%/html/manual318.html
-%%DOCSDIR%%/html/manual319.html
-%%DOCSDIR%%/html/manual32.html
-%%DOCSDIR%%/html/manual320.html
-%%DOCSDIR%%/html/manual321.html
-%%DOCSDIR%%/html/manual322.html
-%%DOCSDIR%%/html/manual323.html
-%%DOCSDIR%%/html/manual324.html
-%%DOCSDIR%%/html/manual325.html
-%%DOCSDIR%%/html/manual326.html
-%%DOCSDIR%%/html/manual327.html
-%%DOCSDIR%%/html/manual328.html
-%%DOCSDIR%%/html/manual329.html
-%%DOCSDIR%%/html/manual33.html
-%%DOCSDIR%%/html/manual330.html
-%%DOCSDIR%%/html/manual331.html
-%%DOCSDIR%%/html/manual332.html
-%%DOCSDIR%%/html/manual333.html
-%%DOCSDIR%%/html/manual334.html
-%%DOCSDIR%%/html/manual335.html
-%%DOCSDIR%%/html/manual336.html
-%%DOCSDIR%%/html/manual337.html
-%%DOCSDIR%%/html/manual338.html
-%%DOCSDIR%%/html/manual339.html
-%%DOCSDIR%%/html/manual34.html
-%%DOCSDIR%%/html/manual340.html
-%%DOCSDIR%%/html/manual341.html
-%%DOCSDIR%%/html/manual342.html
-%%DOCSDIR%%/html/manual35.html
-%%DOCSDIR%%/html/manual36.html
-%%DOCSDIR%%/html/manual37.html
-%%DOCSDIR%%/html/manual38.html
-%%DOCSDIR%%/html/manual39.html
-%%DOCSDIR%%/html/manual4.html
-%%DOCSDIR%%/html/manual40.html
-%%DOCSDIR%%/html/manual41.html
-%%DOCSDIR%%/html/manual42.html
-%%DOCSDIR%%/html/manual43.html
-%%DOCSDIR%%/html/manual44.html
-%%DOCSDIR%%/html/manual45.html
-%%DOCSDIR%%/html/manual46.html
-%%DOCSDIR%%/html/manual47.html
-%%DOCSDIR%%/html/manual48.html
-%%DOCSDIR%%/html/manual49.html
-%%DOCSDIR%%/html/manual5.html
-%%DOCSDIR%%/html/manual50.html
-%%DOCSDIR%%/html/manual51.html
-%%DOCSDIR%%/html/manual52.html
-%%DOCSDIR%%/html/manual53.html
-%%DOCSDIR%%/html/manual54.html
-%%DOCSDIR%%/html/manual55.html
-%%DOCSDIR%%/html/manual56.html
-%%DOCSDIR%%/html/manual57.html
-%%DOCSDIR%%/html/manual58.html
-%%DOCSDIR%%/html/manual59.html
-%%DOCSDIR%%/html/manual6.html
-%%DOCSDIR%%/html/manual60.html
-%%DOCSDIR%%/html/manual61.html
-%%DOCSDIR%%/html/manual62.html
-%%DOCSDIR%%/html/manual63.html
-%%DOCSDIR%%/html/manual64.html
-%%DOCSDIR%%/html/manual65.html
-%%DOCSDIR%%/html/manual66.html
-%%DOCSDIR%%/html/manual67.html
-%%DOCSDIR%%/html/manual68.html
-%%DOCSDIR%%/html/manual69.html
-%%DOCSDIR%%/html/manual7.html
-%%DOCSDIR%%/html/manual70.html
-%%DOCSDIR%%/html/manual71.html
-%%DOCSDIR%%/html/manual72.html
-%%DOCSDIR%%/html/manual73.html
-%%DOCSDIR%%/html/manual74.html
-%%DOCSDIR%%/html/manual75.html
-%%DOCSDIR%%/html/manual76.html
-%%DOCSDIR%%/html/manual77.html
-%%DOCSDIR%%/html/manual78.html
-%%DOCSDIR%%/html/manual79.html
-%%DOCSDIR%%/html/manual8.html
-%%DOCSDIR%%/html/manual80.html
-%%DOCSDIR%%/html/manual81.html
-%%DOCSDIR%%/html/manual82.html
-%%DOCSDIR%%/html/manual83.html
-%%DOCSDIR%%/html/manual84.html
-%%DOCSDIR%%/html/manual85.html
-%%DOCSDIR%%/html/manual86.html
-%%DOCSDIR%%/html/manual87.html
-%%DOCSDIR%%/html/manual88.html
-%%DOCSDIR%%/html/manual89.html
-%%DOCSDIR%%/html/manual9.html
-%%DOCSDIR%%/html/manual90.html
-%%DOCSDIR%%/html/manual91.html
-%%DOCSDIR%%/html/manual92.html
-%%DOCSDIR%%/html/manual93.html
-%%DOCSDIR%%/html/manual94.html
-%%DOCSDIR%%/html/manual95.html
-%%DOCSDIR%%/html/manual96.html
-%%DOCSDIR%%/html/manual97.html
-%%DOCSDIR%%/html/manual98.html
-%%DOCSDIR%%/html/manual99.html
-%%DOCSDIR%%/html/manual_toc.html
-%%DOCSDIR%%/manual.latin1
-@dirrm %%DOCSDIR%%/html
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix22/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix22/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix22/files/patch-conf::main.cf b/mail/postfix22/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix22/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix22/files/patch-conf::post-install b/mail/postfix22/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix22/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix22/files/patch-makedefs b/mail/postfix22/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix22/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix22/files/patch-src::global::mail_params.h b/mail/postfix22/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix22/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix22/files/postfix.sh.in b/mail/postfix22/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix22/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix22/pkg-descr b/mail/postfix22/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix22/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix22/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix22/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix22/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
deleted file mode 100644
index c920df9c761a..000000000000
--- a/mail/postfix22/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix23/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix23/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix23/files/patch-conf::main.cf b/mail/postfix23/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix23/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix23/files/patch-conf::post-install b/mail/postfix23/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix23/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix23/files/patch-makedefs b/mail/postfix23/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix23/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix23/files/patch-src::global::mail_params.h b/mail/postfix23/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix23/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix23/files/postfix.sh.in b/mail/postfix23/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix23/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix23/pkg-descr b/mail/postfix23/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix23/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix23/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix23/pkg-message b/mail/postfix23/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix23/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix23/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
deleted file mode 100644
index 545df61817a5..000000000000
--- a/mail/postfix23/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix24/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix24/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix24/files/patch-conf::main.cf b/mail/postfix24/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix24/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix24/files/patch-conf::post-install b/mail/postfix24/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix24/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix24/files/patch-makedefs b/mail/postfix24/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix24/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix24/files/patch-src::global::mail_params.h b/mail/postfix24/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix24/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix24/files/postfix.sh.in b/mail/postfix24/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix24/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix24/pkg-descr b/mail/postfix24/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix24/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix24/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix24/pkg-message b/mail/postfix24/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix24/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix24/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
deleted file mode 100644
index b9a51f49d3a7..000000000000
--- a/mail/postfix24/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix25/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix25/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix25/files/patch-conf::main.cf b/mail/postfix25/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix25/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix25/files/patch-conf::post-install b/mail/postfix25/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix25/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix25/files/patch-makedefs b/mail/postfix25/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix25/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix25/files/patch-src::global::mail_params.h b/mail/postfix25/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix25/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix25/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix25/pkg-descr b/mail/postfix25/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix25/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix25/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix25/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix25/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
deleted file mode 100644
index b0e0cb2fa7c6..000000000000
--- a/mail/postfix25/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix26/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix26/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix26/files/patch-conf::main.cf b/mail/postfix26/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix26/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix26/files/patch-conf::post-install b/mail/postfix26/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix26/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix26/files/patch-makedefs b/mail/postfix26/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix26/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix26/files/patch-src::global::mail_params.h b/mail/postfix26/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix26/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix26/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix26/pkg-descr b/mail/postfix26/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix26/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix26/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix26/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix26/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
deleted file mode 100644
index b213609ff6f2..000000000000
--- a/mail/postfix26/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix27/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix27/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix27/files/patch-conf::main.cf b/mail/postfix27/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix27/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix27/files/patch-conf::post-install b/mail/postfix27/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix27/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix27/files/patch-makedefs b/mail/postfix27/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix27/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix27/files/patch-src::global::mail_params.h b/mail/postfix27/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix27/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix27/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix27/pkg-descr b/mail/postfix27/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix27/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix27/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix27/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix27/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
deleted file mode 100644
index b9dd974b7709..000000000000
--- a/mail/postfix27/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
deleted file mode 100644
index b4402f699855..000000000000
--- a/mail/postfix28/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rcNG
-_REQUIRE=	DAEMON
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	daemon_directory=${PREFIX}/libexec/postfix \
-	command_directory=${PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PREFIX}/sbin/sendmail \
-	newaliases_path=${PREFIX}/bin/newaliases \
-	mailq_path=${PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PREFIX}/man \
-	sample_directory=${PREFIX}/etc/postfix \
-	readme_directory=${READMEDIR}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
deleted file mode 100644
index 82f7ddc78528..000000000000
--- a/mail/postfix28/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.9.tar.gz) = be78631bd9b6bf7735e43abfa54d69f6
-SHA256 (postfix/postfix-2.2.9.tar.gz) = 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-SIZE (postfix/postfix-2.2.9.tar.gz) = 2442158
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.8-vda.patch.gz) = 50a7768db7bf7374b6e3fa24b99c19b9
-SHA256 (postfix/postfix-2.2.8-vda.patch.gz) = b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
-SIZE (postfix/postfix-2.2.8-vda.patch.gz) = 7741
diff --git a/mail/postfix28/files/patch-conf::main.cf b/mail/postfix28/files/patch-conf::main.cf
deleted file mode 100644
index 67e356de21dd..000000000000
--- a/mail/postfix28/files/patch-conf::main.cf
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
-+++ conf/main.cf	Sat Mar  5 11:53:42 2005
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix28/files/patch-conf::post-install b/mail/postfix28/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix28/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix28/files/patch-makedefs b/mail/postfix28/files/patch-makedefs
deleted file mode 100644
index b51d82fec882..000000000000
--- a/mail/postfix28/files/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Jan  3 19:50:25 2006
-+++ makedefs	Wed Jan  4 23:14:21 2006
-@@ -118,6 +118,8 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix28/files/patch-src::global::mail_params.h b/mail/postfix28/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix28/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in
deleted file mode 100644
index c44c1d84b050..000000000000
--- a/mail/postfix28/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix28/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install
deleted file mode 100644
index fe0c6c6f0243..000000000000
--- a/mail/postfix28/pkg-install
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if [ -x /sbin/sysctl ]; then
-		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-	else
-		OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-	if [ ${OSVERSION} -ge 400014 ]; then
-		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-			mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-			echo "#"						>  /etc/mail/mailer.conf
-			echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-			echo "#"						>> /etc/mail/mailer.conf
-			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		fi
-	else
-		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
-			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-			echo "Done."
-		fi
-	fi
-fi
diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message
deleted file mode 100644
index d4bc72bd9c7d..000000000000
--- a/mail/postfix28/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix28/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
deleted file mode 100644
index 8a4fa6dd9723..000000000000
--- a/mail/postfix28/scripts/configure.postfix
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.72 2006-02-22 13:53:31 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		DB43)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			echo "DB_SUFFIX=	+db43"
-			BDB_SELECTED="43"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.8-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}"
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
deleted file mode 100644
index caf6915735ca..000000000000
--- a/mail/qmail-scanner1/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-# New ports collection makefile for:   qmail-scanner
-# Date created:	       2003-08-24
-# Whom:                moeti
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmail-scanner
-PORTVERSION=	1.25
-PORTREVISION=	2
-CATEGORIES=	mail security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	freebsd@simplerezo.com
-COMMENT=	Content/Anti-virus Scanner for qmail
-
-BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-
-QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
-
-USE_PERL5=	yes
-NO_BUILD=	yes
-
-# Barely optionnal
-.if !defined(WITHOUT_TNEF)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
-.endif
-
-# Options
-QMAILSCAN_ADMIN?=	root
-.if defined(QMAILSCAN_ADMINREALNAME)
-CONFIGURE_ARGS+=	--admin-realname "${QMAILSCAN_ADMINREALNAME}"
-.endif
-.if defined(QMAILSCAN_ARCHIVE)
-CONFIGURE_ARGS+=	--archive yes
-.endif
-QMAILSCAN_NOTIFY?=	psender,precips
-.if defined(QMAILSCAN_LANG)
-CONFIGURE_ARGS+=	--lang "${QMAILSCAN_LANG}"
-.endif
-.if defined(QMAILSCAN_LOCALDOMAINS) && !empty(QMAILSCAN_LOCALDOMAINS)
-CONFIGURE_ARGS+=	--local-domains "${QMAILSCAN_LOCALDOMAINS}"
-.endif
-.if defined(QMAILSCAN_LOGCRYPTO)
-CONFIGURE_ARGS+=	--log-crypto yes
-.endif
-.if defined(QMAILSCAN_NOTUNZIP)
-CONFIGURE_ARGS+=	--unzip no
-.else
-CONFIGURE_ARGS+=	--unzip yes
-.if defined(QMAILSCAN_MAXZIPSIZE)
-CONFIGURE_ARGS+=	--max-zip-size "${QMAILSCAN_MAXZIPSIZE}"
-.endif
-.if !defined(QMAILSCAN_NOTBLKZIPPW)
-BUILD_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
-CONFIGURE_ARGS+=	--block-password-protected yes
-.endif
-.endif
-.if defined(QMAILSCAN_SCANNERS)
-CONFIGURE_ARGS+=	--scanners "${QMAILSCAN_SCANNERS}"
-.else
-CONFIGURE_ARGS+=	--scanners auto
-.endif
-QMAILSCAN_SILENTVIRUSES?=	auto
-.if defined(QMAILSCAN_SPAMSREDIRECT)
-CONFIGURE_ARGS+=	--spams-redirect "${QMAILSCAN_SPAMSREDIRECT}"
-.endif
-.if defined(QMAILSCAN_SPAMSTOSUFFIX)
-CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
-.endif
-
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-USE_QMAIL=	yes
-
-SPOOLDIR=	${PREFIX}/qmailscan
-PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	\
-		--qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \
-		--bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \
-		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
-		--silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \
-		--redundant yes \
-		--add-dscr-hdrs yes \
-		--log-details syslog --debug no \
-		--batch
-
-pre-configure:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "----------------------------------------"
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "QMAILSCAN_ADMIN          email adress of qmail-scanner admin for alerts"
-	@${ECHO_MSG} "QMAILSCAN_ADMINREALNAME* name to use when sending alerts"
-	@${ECHO_MSG} "QMAILSCAN_LANG           specify languages for QS mails (notify, etc..)"
-	@${ECHO_MSG} "                         supported languages are: af_ZA, cs_CZ, da_DK, de_DE,"
-	@${ECHO_MSG} "                         en_GB, en_PL, enlt_LT, enlt_LT_short, es_ES, fr_FR,"
-	@${ECHO_MSG} "                         it_IT, ja_JP.EUC, nl_NL, no_NO, pl_PL, pt_BR, pt_PT,"
-	@${ECHO_MSG} "                         sk_SK, sv_SE, tr_TR, tr_TR_ascii and tw_BIG5"
-	@${ECHO_MSG} "                         default depends on your LANG variable"
-	@${ECHO_MSG} "                         (en_GB if LANG is not set)"
-	@${ECHO_MSG} "QMAILSCAN_LOCALDOMAINS   domains classified as local domains preventing alerts"
-	@${ECHO_MSG} "                         of externals users (and mailing-lists...)"
-	@${ECHO_MSG} "QMAILSCAN_LOGCRYPTO      simply notes in the log record if the message"
-	@${ECHO_MSG} "                         contained any form of digital signing or encryption"
-	@${ECHO_MSG} "                         (S/MIME, PGP and password protected files)"
-	@${ECHO_MSG} "                         default is disabled"
-	@${ECHO_MSG} "QMAILSCAN_MAXZIPSIZE     zip that would have unpacked into more diskspace"
-	@${ECHO_MSG} "                         than this value will be blocked (prevent DoS)"
-	@${ECHO_MSG} "                         default is 1000000000"
-	@${ECHO_MSG} "QMAILSCAN_NOTBLKZIPPW    zip password protected are blocked by default"
-	@${ECHO_MSG} "                         setting this variable to disable this function"
-	@${ECHO_MSG} "QMAILSCAN_NOTIFY         who has to be notify of viruses/spams"
-	@${ECHO_MSG} "                         defaults to 'psender,precips'"
-	@${ECHO_MSG} "QMAILSCAN_SCANNERS       list of installed content scanner"
-	@${ECHO_MSG} "                         default is automatic, so you do not need to set this"
-	@${ECHO_MSG} "QMAILSCAN_SILENTVIRUSES  viruses that qs shoud not notify about"
-	@${ECHO_MSG} "QMAILSCAN_SPAMSREDIRECT* set this if you want to redirect all spams to a"
-	@${ECHO_MSG} "                         specific email address"
-	@${ECHO_MSG} "QMAILSCAN_SPAMSTOSUFFIX* suffix to alter spams recipients with"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "When you set the last option to 'spam', a detected spam will be delivered to"
-	@${ECHO_MSG} "'user-spam@domain' instead of 'user@domain'."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "* Please note these options are only available with FreeBSD ports "
-	@${ECHO_MSG} "So please, do not report relatives bugs to qmail-scanner team, but maintainer."
-	@${ECHO_MSG} "----------------------------------------"
-	@${ECHO_MSG} ""
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
-	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
-		${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
-		${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
-		exit 1; \
-	fi
-
-post-configure:
-	${TEST} -f ${WRKSRC}/qmail-scanner-queue.pl
-
-do-install:
-	-${TEST} -f ${PREFIX}/bin/qmail-scanner-queue.pl && \
-		${MV} ${PREFIX}/bin/qmail-scanner-queue.pl \
-			${PREFIX}/bin/qmail-scanner-queue.pl.old
-	${INSTALL_SCRIPT} ${WRKSRC}/qmail-scanner-queue.pl ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/qs2mrtg.pl ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt \
-		${SPOOLDIR}/quarantine-attachments.sample
-	${TEST} -f ${SPOOLDIR}/quarantine-attachments.txt || \
-		${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt ${SPOOLDIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/mrtg-qmail-scanner.cfg \
-		${PREFIX}/share/examples/qs2mrtg
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-
-post-deinstall:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you're not updating this port, you can delete directory '${SPOOLDIR}'."
-	@${ECHO_MSG} ""
-
-test:
-	@${WRKSRC}/contrib/test_installation.sh -doit
-
-.include <bsd.port.mk>
diff --git a/mail/qmail-scanner1/distinfo b/mail/qmail-scanner1/distinfo
deleted file mode 100644
index fe3e81817c66..000000000000
--- a/mail/qmail-scanner1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (qmail-scanner-1.25.tgz) = 0117c425efb75208682fabcba4e1dd24
-SHA256 (qmail-scanner-1.25.tgz) = 6fa5743a0d180bc4d1a626c4bf56c06a29ec3c0d7cb2ce834add8faceefb9c01
-SIZE (qmail-scanner-1.25.tgz) = 221156
diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure
deleted file mode 100644
index 6c2bfd5adfac..000000000000
--- a/mail/qmail-scanner1/files/patch-configure
+++ /dev/null
@@ -1,145 +0,0 @@
---- ./configure.orig	Mon Oct 18 21:26:55 2004
-+++ ./configure	Mon Jan 31 09:07:22 2005
-@@ -1,13 +1,6 @@
- #!/bin/sh
- #
- 
--#Pipe into bash if it's present
--
--if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then
--    exec bash $0 $*
--    exit
--fi
--
- umask 007
- 
- OLD_LANG="$LANG" 
-@@ -51,6 +44,12 @@
-     #reset all English to en_GB
-     QSLANG="en_GB"
- fi
-+ 
-+QSLANG=`echo $QSLANG|sed 's/\..*//'`
-+if [ "$QSLANG" = "ja_JP" ]; then
-+    #reset all Japanese to ja_JP.EUC
-+    QSLANG="ja_JP.EUC"
-+fi
- 
- if [ ! -d "./locale/$QSLANG" ]; then
-     echo "
-@@ -87,7 +86,8 @@
- QUARANTINE_PASSWORD_PROTECTED="0"
- DESCRIPTIVE_HEADERS="0"
- NOTIFY_ADDRESSES="psender,nmlvadm"
--USERNAME="$USER"
-+ADMIN_MAIL="$USER"
-+ADMIN_REALNAME="System Anti-Virus Administrator"
- MANUAL_INSTALL="0"
- INSTALLIT="0"
- DONOTCONFIRM="0"
-@@ -100,13 +100,17 @@
- 
- while [ -n "$1" ]
- do
-+
-+
-     case $1 in
-         --qs-user) if [ "$2" != "" ] ; then  shift ; fi ; QS_USER="$1" ;; 
-         --spooldir) if [ "$2" != "" ] ; then  shift ; fi ; AS_QQ="$1" ;;
- 	--qmaildir) if [ "$2" != "" ]; then shift ; fi ; QMAILDIR="$1" ;;
- 	--bindir) if [ "$2" != "" ] ; then  shift ; fi ; BINDIR="$1" ;;
--	--user|--admin) if [ "$2" != "" ] ; then  shift ; fi ; USERNAME="$1" ;;
--	--domain) if [ "$2" != "" ] ; then  shift ; fi ; MAILDOMAIN="$1" ;;
-+	--admin|--user) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_MAIL=`echo $1 | sed 's/@/\\\\@/'` ;;
-+	--admin-realname) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_REALNAME="$1" ;;
-+	--spams-redirect) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_REDIRECT=`echo $1 | sed 's/@/\\\\@/'` ;;
-+	--spams-tosuffix) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_TOSUFFIX="$1" ;;
- 	--notify) if [ "$2" != "" ]; then shift ; fi ; NOTIFY_ADDRESSES="$1" ;;
- 	--batch) DONOTCONFIRM="1" ; if [ "$2" != "" -a "`echo $2|grep '\-'`" = "" ] ; then  shift ; fi ;;
- 	--silent-viruses) if [ "$2" != "" ]; then shift ; fi ; FIND_SILENT_VIRUSES="$1" ;;
-@@ -138,9 +142,17 @@
-   --spooldir <spooldir> defaults to $AS_QQ/
-   --bindir <installdir> where to install qmail-scanner-queue.pl
-                         Defaults to /var/qmail/bin/
--  --admin <username> user to Email alerts to (default: $USERNAME)
--  --domain <domain name> "user"@"domain" makes up Email address
--	 to Email alerts to.
-+  --admin <email> email to send alerts to (default: $ADMIN_MAIL)
-+  --admin-realname <...> realname for sending alerts
-+                         Defaults to "$ADMIN_REALNAME"
-+			 nb: use '_' instead of ' ' (sorry for inconvenience)
-+  --spams-redirect <email> email to redirect detected spams to
-+                           Defaults to empty (no redirection)
-+  --spams-tosuffix <suffix> suffix to alter recipient with
-+                            i.e. recipient user@domain
-+                                 will be transform into user-suffix@domain
-+                            Defaults to empty (do not alter recipients)
-+                            nb: 'spams-admin' option has precedence on this
-   --scanners <list of installed content scanners>
- 				    Defaults to "auto" - will use
- 				    whatever scanners are found on system.
-@@ -910,7 +922,7 @@
- 	    #Test to see if spamc is calling Unix sockets instead of TCP
- 	    SPAMD_SOCKET=`ps -ef 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
- 	    if [ "$SPAMD_SOCKET" = "" ]; then
--		SPAMD_SOCKET=`ps aux 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
-+		SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath[\ |=]//'|awk '{print $1}'`
- 	    fi
- 	    if [ "$SPAMD_SOCKET" != "" -a -S "$SPAMD_SOCKET" ]; then
- 		SPAMC_BINARY="$SPAMC_BINARY -U $SPAMD_SOCKET"
-@@ -1005,9 +1017,14 @@
- 
- MAILDOMAIN=${MAILDOMAIN:-$FQDN}
- LOCAL_DOMAINS_ARRAY=${LOCAL_DOMAINS_ARRAY:-$MAILDOMAIN}
--CMDLINE="$0 --spooldir $AS_QQ --qmaildir $QMAILDIR --bindir $BINDIR --qmail-queue-binary $QMAILQUEUE_BIN  --admin $USERNAME --domain $MAILDOMAIN --notify $NOTIFY_ADDRESSES --local-domains $LOCAL_DOMAINS_ARRAY --silent-viruses $SILENT_VIRUSES --lang $QSLANG --debug $DEBUG_LEVEL --unzip $FORCE_UNZIP --block-password-protected $QUARANTINE_PASSWORD_PROTECTED --add-dscr-hdrs $DESCRIPTIVE_HEADERS --archive $ARCHIVEIT --redundant $REDUNDANT --log-details $LOG_DETAILS --log-crypto $LOG_CRYPTO --fix-mime $FIX_MIME  --ignore-eol-check $DISABLE_EOL_CHECK --scanners \"$SCANNERS\""
--
-+CMDLINE="$0 --spooldir $AS_QQ --qmaildir $QMAILDIR --bindir $BINDIR --qmail-queue-binary $QMAILQUEUE_BIN  --admin $ADMIN_MAIL --admin-realname \"$ADMIN_REALNAME\" --domain $MAILDOMAIN --notify $NOTIFY_ADDRESSES --local-domains $LOCAL_DOMAINS_ARRAY --silent-viruses $SILENT_VIRUSES --lang $QSLANG --debug $DEBUG_LEVEL --unzip $FORCE_UNZIP --block-password-protected $QUARANTINE_PASSWORD_PROTECTED --add-dscr-hdrs $DESCRIPTIVE_HEADERS --archive $ARCHIVEIT --redundant $REDUNDANT --log-details $LOG_DETAILS --log-crypto $LOG_CRYPTO --fix-mime $FIX_MIME  --ignore-eol-check $DISABLE_EOL_CHECK --scanners \"$SCANNERS\""
- 
-+if [ -n "$SPAMS_REDIRECT" ]; then
-+    CMDLINE="$CMDLINE --spams-redirect $SPAMS_REDIRECT"
-+fi
-+if [ -n "$SPAMS_TOSUFFIX" ]; then
-+    CMDLINE="$CMDLINE --spams-tosuffix $SPAMS_TOSUFFIX"
-+fi
- if [ "$MANUAL_INSTALL" = "1" ]; then
-     CMDLINE="$CMDLINE --no-QQ-check $MANUAL_INSTALL"
- fi
-@@ -1381,7 +1398,7 @@
-     fi
- fi
- 
--USERNAME=${USERNAME:-$LOGNAME}
-+ADMIN_MAIL=${ADMIN_MAIL:-$LOGNAME}
- 
- SCANNER_ARRAY=`echo $SCANNER_ARRAY|sed 's/^,//g'`
- 
-@@ -1461,7 +1478,13 @@
-     fi
-     echo "archiving $ASTRING into $AS_QQ/$ARCHIVEDIR/"
- fi
--echo "virus-admin=$USERNAME@$MAILDOMAIN"
-+echo "admin=$ADMIN_MAIL"
-+if [ -n "$SPAMS_REDIRECT" ]; then
-+  echo "spams-admin=$SPAMS_REDIRECT"
-+fi
-+if [ -n "$SPAMS_TOSUFFIX" ]; then
-+  echo "spams-suffix=$SPAMS_TOSUFFIX"
-+fi
- echo "local-domains=$LOCAL_DOMAINS_ARRAY"
- echo "silent-viruses=$FIND_SILENT_VIRUSES_ARRAY"
- echo "scanners=$SCANNER_ARRAY"
-@@ -1623,10 +1646,12 @@
- s?SPAMC_BINARY?$SPAMC_BINARY?g;
- s?SPAMC_OPTIONS?$SPAMC_OPTIONS?g;
- s?SPAMC_SUBJECT?$SPAMC_SUBJECT?g;
--s?USERNAME?$USERNAME?g;
-+s?ADMIN_MAIL?$ADMIN_MAIL?g;
-+s?ADMIN_REALNAME?$ADMIN_REALNAME?g;
-+s?SPAMS_REDIRECT?$SPAMS_REDIRECT?g;
-+s?SPAMS_TOSUFFIX?$SPAMS_TOSUFFIX?g;
- s?SKIP_TEXT_MSGS?$SKIP_TEXT_MSGS?g;
- s?FQDN?$FQDN?g;
--s?MAILDOMAIN?$MAILDOMAIN?g;
- s?LOCAL_DOMAINS_ARRAY?$LOCAL_DOMAINS_ARRAY?g;
- s?NOTIFY_ADDRESSES?$NOTIFY_ADDRESSES?g;
- s?FIND?$FIND?g;
diff --git a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template b/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template
deleted file mode 100644
index ad2728979032..000000000000
--- a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template
+++ /dev/null
@@ -1,51 +0,0 @@
---- qmail-scanner-queue.template.orig	Wed Mar 10 21:02:05 2004
-+++ qmail-scanner-queue.template	Mon Mar 15 01:26:52 2004
-@@ -85,11 +85,17 @@
- 
- 
- #From: line  information used when making reports
--my $V_FROM='USERNAME@MAILDOMAIN';
--my $V_FROMNAME='System Anti-Virus Administrator';
-+my $V_FROM='ADMIN_MAIL';
-+my $V_FROMNAME='ADMIN_REALNAME';
- 
- # Address carbon-copied on any virus reports
--my $QUARANTINE_CC='USERNAME@MAILDOMAIN';
-+my $QUARANTINE_CC='ADMIN_MAIL';
-+
-+# Address to where spams are redirected
-+my $SPAMSADMIN='SPAMS_REDIRECT';
-+
-+# Suffix to alter recipients with (when spam detected)
-+my $SPAMSSUFFIX='SPAMS_TOSUFFIX';
- 
- #Array of local domains that are checked against for
- #deciding whether or not to send recipient alerts to
-@@ -302,6 +308,7 @@
- }
- 
- my ($quarantine_event,$quarantine_event_tmp,$quarantine_DOS)=0;
-+my $spam_event=0;
- 
- my $file_id = &uniq_id();
- 
-@@ -424,7 +431,18 @@
-     &email_quarantine_report;
-   } else {
-     &qmail_parent_check;
--    &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); 
-+    if ($spam_event) {
-+      if ($SPAMSADMIN) {
-+        &qmail_requeue($env_returnpath,"T$SPAMSADMIN\0\0","$scandir/$wmaildir/new/$file_id"); 
-+      } elsif ($SPAMSSUFFIX) {
-+	$env_recips =~ s/\@/\-$SPAMSSUFFIX\@/g;
-+        &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); 
-+      } else {
-+        &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); 
-+      }
-+    } else {
-+      &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); 
-+    }
-   }
-   alarm 0;
- };
diff --git a/mail/qmail-scanner1/files/patch-sub-spamassassin.pl b/mail/qmail-scanner1/files/patch-sub-spamassassin.pl
deleted file mode 100644
index 8daf87ded5c2..000000000000
--- a/mail/qmail-scanner1/files/patch-sub-spamassassin.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- sub-spamassassin.pl.orig	Thu Dec  4 22:17:55 2003
-+++ sub-spamassassin.pl	Mon Mar 15 01:27:28 2004
-@@ -61,6 +61,7 @@
-     $tag_score .= "SA:1($sa_score/$sa_max):";
-     $sa_comment = "Yes, hits=$sa_score required=$sa_max" if ($sa_fast);
-     &debug("SA: yup, this smells like SPAM");
-+    $spam_event = 1;
-   }	
-   if ($sa_score > 0) {
-     $sa_score=int($sa_score);
diff --git a/mail/qmail-scanner1/pkg-descr b/mail/qmail-scanner1/pkg-descr
deleted file mode 100644
index e1a3e30d6f0e..000000000000
--- a/mail/qmail-scanner1/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Qmail-Scanner is e-mail content scanner that enables a qmail server to
-scan all messages it receives for certain characteristics (normally viruses),
-and react accordingly.
-
-If you have a commercial virus scanner (eg, Sophos sweep, McAfee
-uvscan, etc) installed when you build qmail-scanner, qmail-scanner
-will configure itself to use that.  Otherwise, it will only use its
-internal content filter which only allows you to block mail based
-on text in the subject/body, general types of attachments, etc.
-
-WWW:	http://qmail-scanner.sourceforge.net/
diff --git a/mail/qmail-scanner1/pkg-install b/mail/qmail-scanner1/pkg-install
deleted file mode 100644
index e42be90badcb..000000000000
--- a/mail/qmail-scanner1/pkg-install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-CHMOD=/bin/chmod
-CHOWN=/usr/sbin/chown
-MKDIR=/bin/mkdir
-PW=/usr/sbin/pw
-
-GU_ID=98
-GU_NAME=qscand
-
-PREFIX=${PKG_PREFIX}
-SPOOLDIR=${PREFIX}/qmailscan
-
-case "$2" in
-PRE-INSTALL)
-  # User and group
-  ${PW} groupshow -n ${GU_NAME} >/dev/null 2>&1 \
-    || ${PW} groupadd -n ${GU_NAME} -g ${GU_ID}
-  ${PW} usershow -n ${GU_NAME} >/dev/null 2>&1 \
-    || ${PW} useradd ${GU_NAME} -g ${GU_NAME} -u ${GU_ID} -s /sbin/nologin
-  ${MKDIR} -p ${SPOOLDIR}
-  ${MKDIR} -p ${PREFIX}/share/examples/qs2mrtg
-  ;;
-POST-INSTALL)
-  # Directories
-  for i in quarantine working archives; do
-    for j in tmp cur new; do
-      ${MKDIR} -p ${SPOOLDIR}/$i/$j
-    done
-  done
-  ${MKDIR} -p ${SPOOLDIR}/tmp
-
-  # Mod and owner
-  ${CHOWN} -R ${GU_NAME}:${GU_NAME} ${SPOOLDIR}
-  ${CHOWN} ${GU_NAME}:${GU_NAME} ${PREFIX}/bin/qmail-scanner-queue.pl
-  ${CHMOD} 4755 ${PREFIX}/bin/qmail-scanner-queue.pl
-
-  # Initialize
-  ${PREFIX}/bin/qmail-scanner-queue.pl -z
-  ${PREFIX}/bin/qmail-scanner-queue.pl -g
-
-  # Mod and owner (final)
-  ${CHOWN} -R ${GU_NAME}:${GU_NAME} ${SPOOLDIR}
-  ;;
-esac
diff --git a/mail/qmail-scanner1/pkg-message b/mail/qmail-scanner1/pkg-message
deleted file mode 100644
index e61b55935bea..000000000000
--- a/mail/qmail-scanner1/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-****************************************************
-NOTES:
- - You have to configure your anti-virus and anti-spams products!
- - You HAVE to reinstall this port each time you add or remove one!
-
-Now, you have to modify your qmail startup files to call qmail-scanner.
-In most case, you just need to add:
-  export QMAILQUEUE="${PREFIX}/bin/qmail-scanner-queue.pl"
-to your tcpserver startup file.
-
-You can test installation by running 'make test' in port dir.
-****************************************************
diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist
deleted file mode 100644
index bbc89c5de733..000000000000
--- a/mail/qmail-scanner1/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-bin/qmail-scanner-queue.pl
-bin/qs2mrtg.pl
-share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
-@dirrm share/examples/qs2mrtg
-@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi
-%%SPOOLDIR%%/quarantine-attachments.sample
-@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
-%%SPOOLDIR%%/qmail-scanner-queue-version.txt
-@dirrmtry %%SPOOLDIR%%/archives/cur
-@dirrmtry %%SPOOLDIR%%/archives/new
-@dirrmtry %%SPOOLDIR%%/archives/tmp
-@dirrmtry %%SPOOLDIR%%/archives
-@dirrmtry %%SPOOLDIR%%/quarantine/cur
-@dirrmtry %%SPOOLDIR%%/quarantine/new
-@dirrmtry %%SPOOLDIR%%/quarantine/tmp
-@dirrmtry %%SPOOLDIR%%/quarantine
-@dirrmtry %%SPOOLDIR%%/working/cur
-@dirrmtry %%SPOOLDIR%%/working/new
-@dirrmtry %%SPOOLDIR%%/working/tmp
-@dirrmtry %%SPOOLDIR%%/working
-@dirrmtry %%SPOOLDIR%%/tmp
-@dirrmtry %%SPOOLDIR%%
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
deleted file mode 100644
index 26ae4608ef3e..000000000000
--- a/mail/qmhandle/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	qmHandle
-# Date created:				17 August 2001
-# Whom:					petef
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmHandle
-PORTVERSION=	1.2.0
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	qmhandle
-DISTNAME=	qmhandle-${PORTVERSION}
-
-MAINTAINER=	petef@FreeBSD.org
-COMMENT=	Tool to view and manage a qmail queue
-
-USE_QMAIL_RUN=	yes
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-USE_PERL5=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=         requires perl 5.6.1 or later. Install lang/perl5 then try again
-.endif
-
-post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},; \
-		s,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/qmHandle
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in HISTORY README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/qmhandle/distinfo b/mail/qmhandle/distinfo
deleted file mode 100644
index 4341c6a3b2c4..000000000000
--- a/mail/qmhandle/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (qmhandle-1.2.0.tar.gz) = 0d2b5f1756d7641a8a8054e29e1b9747
-SHA256 (qmhandle-1.2.0.tar.gz) = 001530bedb8b3f2696a645abd28a5af3c46fa31e0e0208f94287920d784433bd
-SIZE (qmhandle-1.2.0.tar.gz) = 13134
diff --git a/mail/qmhandle/files/patch-qmHandle b/mail/qmhandle/files/patch-qmHandle
deleted file mode 100644
index e0b05bfe1b91..000000000000
--- a/mail/qmhandle/files/patch-qmHandle
+++ /dev/null
@@ -1,34 +0,0 @@
-$FreeBSD$
-
---- qmHandle.orig	Thu Jan 16 10:05:21 2003
-+++ qmHandle	Thu Jan 16 10:31:33 2003
-@@ -26,8 +26,12 @@
- #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
- 
- # While this is if you have a Debian GNU/Linux with its qmail package
--my ($stopqmail) = '/etc/init.d/qmail stop';
--my ($startqmail) = '/etc/init.d/qmail start';
-+#my ($stopqmail) = '/etc/init.d/qmail stop';
-+#my ($startqmail) = '/etc/init.d/qmail start';
-+
-+# This is if you have FreeBSD with its qmail package
-+my ($stopqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh stop';
-+my ($startqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh start';
- 
- # If you don't have scripts, leave $stopqmail blank (the process will
- # be hunted and killed by qmHandle):
-@@ -43,7 +47,10 @@
- #####
- # Enter here the system command which returns qmail PID. The following
- # should work on most Unixes:
--my ($pidcmd) = 'pidof qmail-send';
-+#my ($pidcmd) = 'pidof qmail-send';
-+# This is for FreeBSD with a standard qmail installation:
-+my ($pidcmd) = 'ps -U qmails | grep qmail-send | cut -s -d " " -f 1';
-+
- 
- ####################  USER CONFIGURATION END  ####################
- 
-
-
-
diff --git a/mail/qmhandle/pkg-descr b/mail/qmhandle/pkg-descr
deleted file mode 100644
index 9802349bd5de..000000000000
--- a/mail/qmhandle/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-qmHandle is a simple program which allows you to view and manage a qmail
-message queue.
-
-The key features of qmHandle are:
-  * You can read the qmail queue, like you do with the qmail-qread program.
-    However, the output of this program is improved over qmail-qread, with
-    the output of the message subjects and color capabilities;
-  * You can print queue statistics, like qmail-qstat, with color capabilities;
-  * You can view a message in the queue;
-  * You can remove a message from the queue.
-
-WWW: http://qmhandle.sourceforge.net/
-
-- Pete
-petef@FreeBSD.org
diff --git a/mail/qmhandle/pkg-plist b/mail/qmhandle/pkg-plist
deleted file mode 100644
index 2bb092b008dd..000000000000
--- a/mail/qmhandle/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/qmHandle
-%%PORTDOCS%%share/doc/qmHandle/HISTORY
-%%PORTDOCS%%share/doc/qmHandle/README
-%%PORTDOCS%%@dirrm share/doc/qmHandle
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
deleted file mode 100644
index 3fdb0689797d..000000000000
--- a/mail/rubygem-tmail/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	Ruby-TMail
-# Date created:		22 Aug 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tmail
-PORTVERSION=	0.10.8
-CATEGORIES=	mail ruby
-MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A RFC2822/MIME compliant mail manipulating library for Ruby
-
-USE_RUBY=	yes
-USE_RUBY_SETUP=	yes
-USE_RUBY_FEATURES=	racc-runtime
-
-DOCS_EN=	Incompatibilities	README.en	doc.en/*	\
-		*ChangeLog		BUGS		TODO
-DOCS_JA=	Incompatibilities.ja	README.ja	doc.ja/*
-
-do-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo
deleted file mode 100644
index cccc305d32f2..000000000000
--- a/mail/rubygem-tmail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ruby/tmail-0.10.8.tar.gz) = abd5916459691aec669f1bbf78e201d3
-SHA256 (ruby/tmail-0.10.8.tar.gz) = ac6daa85ba25d713ccba7e1f75d41af88175e5b0419b8397fa359d3f4e2e1d1c
-SIZE (ruby/tmail-0.10.8.tar.gz) = 125752
diff --git a/mail/rubygem-tmail/pkg-descr b/mail/rubygem-tmail/pkg-descr
deleted file mode 100644
index 659655c1c621..000000000000
--- a/mail/rubygem-tmail/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-TMail is a mail manipulating library for Ruby, with RFC822 and MIME
-multipart support.
-
-Author:	Minero Aoki <aamine@loveruby.net>
-WWW:	http://www.loveruby.net/en/tmail.html
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
deleted file mode 100644
index 2349b7f9d884..000000000000
--- a/mail/rubygem-tmail/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/tmail/base64.so
-%%RUBY_SITEARCHLIBDIR%%/tmail/scanner_c.so
-%%RUBY_SITELIBDIR%%/tmail.rb
-@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
-%%RUBY_SITELIBDIR%%/tmail/address.rb
-%%RUBY_SITELIBDIR%%/tmail/base64.rb
-%%RUBY_SITELIBDIR%%/tmail/compat.rb
-%%RUBY_SITELIBDIR%%/tmail/config.rb
-%%RUBY_SITELIBDIR%%/tmail/encode.rb
-%%RUBY_SITELIBDIR%%/tmail/header.rb
-%%RUBY_SITELIBDIR%%/tmail/info.rb
-%%RUBY_SITELIBDIR%%/tmail/loader.rb
-%%RUBY_SITELIBDIR%%/tmail/mail.rb
-%%RUBY_SITELIBDIR%%/tmail/mailbox.rb
-%%RUBY_SITELIBDIR%%/tmail/mbox.rb
-%%RUBY_SITELIBDIR%%/tmail/net.rb
-%%RUBY_SITELIBDIR%%/tmail/obsolete.rb
-%%RUBY_SITELIBDIR%%/tmail/parser.rb
-%%RUBY_SITELIBDIR%%/tmail/port.rb
-%%RUBY_SITELIBDIR%%/tmail/scanner.rb
-%%RUBY_SITELIBDIR%%/tmail/scanner_r.rb
-%%RUBY_SITELIBDIR%%/tmail/stringio.rb
-%%RUBY_SITELIBDIR%%/tmail/textutils.rb
-%%RUBY_SITELIBDIR%%/tmail/tmail.rb
-%%RUBY_SITELIBDIR%%/tmail/utils.rb
-@dirrm %%RUBY_SITELIBDIR%%/tmail
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/extract-attachements.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/0ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mailbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mailbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index cc29b34d9857..496140d888d2 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sendmail
-PORTVERSION=	8.13.5
+PORTVERSION=	8.13.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index fd3fcc9d6a52..6bd3c011b022 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (sendmail.8.13.5.tar.gz) = f4550d8dcc55771f4a81e999c7d6df20
-SHA256 (sendmail.8.13.5.tar.gz) = 22f26d9a3146f455e44ad448e84ada6f0865b2e029b191c34fbf406325f95a1e
-SIZE (sendmail.8.13.5.tar.gz) = 1978185
+MD5 (sendmail.8.13.6.tar.gz) = 484cca51f74b5e562b3cf119ceb2f900
+SHA256 (sendmail.8.13.6.tar.gz) = 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a
+SIZE (sendmail.8.13.6.tar.gz) = 1986576
diff --git a/mail/squirrelmail-compatibility-plugin1/Makefile b/mail/squirrelmail-compatibility-plugin1/Makefile
deleted file mode 100644
index 83b9ab258b70..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# New ports collection makefile for:	squirrelmail-compatibility-plugin
-# Date created:		3 Jul 2005
-# Whom:		Alexander Wittig <alexander@wittig.name>
-#
-# $FreeBSD$
-
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		2.0.4
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
-DIST_SUBDIR=		squirrelmail
-
-MAINTAINER=		alexander@wittig.name
-COMMENT=		Required by many plugins for compatibility with SquirrelMail
-
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
-
-SQUIRREL_PLUGIN_NAME=		compatibility
-
-.ifdef SQUIRRELDIR
-PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
-.else
-.	ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=		${PREFIX}/www/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=www/squirrelmail
-.	else
-SQUIRRELDIR=		${PREFIX}/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=squirrelmail
-.	endif
-.endif
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=		yes
-WANT_PHP_WEB=		yes
-
-pre-everything::
-	@${ECHO} ""
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you don't want to automatically activate the plug-in set"
-	@${ECHO} "WITHOUT_ACTIVATE=yes"
-.else
-	@${ECHO} "NOT Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you want to automatically activate the plug-in unset"
-	@${ECHO} "WITHOUT_ACTIVATE"
-.endif
-	@${ECHO} ""
-
-do-install:
-	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-
-post-install:
-	@${ECHO} "Patching SquirrelMail for compatibility plugin"
-	@${ECHO} ""
-	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
-	@${ECHO} ""
-
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.else
-	@${ECHO} "To activate the plug-in in SquirrelMail use"
-	@${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/squirrelmail-compatibility-plugin1/distinfo b/mail/squirrelmail-compatibility-plugin1/distinfo
deleted file mode 100644
index fb8976f4828d..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (squirrelmail/compatibility-2.0.4.tar.gz) = cfc3279a613b917fcba8200c596dadb0
-SHA256 (squirrelmail/compatibility-2.0.4.tar.gz) = 5aa1bbf871a131eeb3d64e9c89b239231927ebc9aee81a272a31d014ccae667e
-SIZE (squirrelmail/compatibility-2.0.4.tar.gz) = 18703
diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-descr b/mail/squirrelmail-compatibility-plugin1/pkg-descr
deleted file mode 100644
index a37b1c7a2078..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-SquirrelMail Plug-in that provdies a standard API for plugin authors who need
-certain functionalities that may not be available in older versions of
-SquirrelMail. SquirrelMail administrators only need to download this plugin if
-any of the plugins they have require it.
-This plugin has no functionality in and of itself.
-
-WWW: http://www.squirrelmail.org
-
-- Alexander Wittig
-alexander@wittig.name
diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-plist b/mail/squirrelmail-compatibility-plugin1/pkg-plist
deleted file mode 100644
index 73587d84dd40..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-@unexec %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility
-@unexec mv -f %D/%%SQUIRRELDIR%%/functions/strings.php.orig %D/%%SQUIRRELDIR%%/functions/strings.php
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
-%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
-%%SQUIRRELDIR%%/plugins/compatibility/COPYING
-%%SQUIRRELDIR%%/plugins/compatibility/functions.php
-%%SQUIRRELDIR%%/plugins/compatibility/getpot
-%%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/setup.php
-%%SQUIRRELDIR%%/plugins/compatibility/version
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.0.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.1.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.2.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.3.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.6.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.2.11.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.5.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.6.diff
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility
-@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
-@exec %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility
diff --git a/mail/sylpheed-claws-rssyl/Makefile b/mail/sylpheed-claws-rssyl/Makefile
deleted file mode 100644
index 5b5d2b065ae0..000000000000
--- a/mail/sylpheed-claws-rssyl/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	rssyl
-# Date created:				17 December 2005
-# Whom:					v.velox@vvelox.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rssyl
-PORTVERSION=	0.3
-CATEGORIES=	mail
-MASTER_SITES=	http://ticho.yweb.sk/rssyl/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
-
-MAINTAINER=	v.velox@vvelox.net
-COMMENT=	A RSS/Atom plugin for sylheed-claws
-
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	sylpheed-claws:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws:${PORTSDIR}/mail/sylpheed-claws
-
-USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	autoconf:259
-USE_REINPLACE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/100\.93/100/' ${WRKSRC}/configure.ac
-
-.include <bsd.port.mk>
diff --git a/mail/sylpheed-claws-rssyl/distinfo b/mail/sylpheed-claws-rssyl/distinfo
deleted file mode 100644
index cb7e6b040fbb..000000000000
--- a/mail/sylpheed-claws-rssyl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (rssyl-0.3.tar.gz) = 53866c464c35737d0ba684c85491014c
-SHA256 (rssyl-0.3.tar.gz) = 225f78b9f611a269c9a50ecc7405c9ef8a8d57c27166b80f5afdd37f561d359f
-SIZE (rssyl-0.3.tar.gz) = 390916
diff --git a/mail/sylpheed-claws-rssyl/pkg-descr b/mail/sylpheed-claws-rssyl/pkg-descr
deleted file mode 100644
index be7f838efff1..000000000000
--- a/mail/sylpheed-claws-rssyl/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This plugin allows you to read your favorite newsfeeds in Claws.
-RSS 1.0, 2.0 and Atom feeds are currently supported.
-
-WWW: http://ticho.yweb.sk/rssyl/
diff --git a/mail/sylpheed-claws-rssyl/pkg-plist b/mail/sylpheed-claws-rssyl/pkg-plist
deleted file mode 100644
index 2087f9e78825..000000000000
--- a/mail/sylpheed-claws-rssyl/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/sylpheed-claws/plugins/rssyl.a
-lib/sylpheed-claws/plugins/rssyl.la
-lib/sylpheed-claws/plugins/rssyl.so
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
deleted file mode 100644
index 60c34e83297f..000000000000
--- a/mail/sylpheed3/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-# New ports collection makefile for:	sylpheed
-# Date created:                 15 June 2000
-# Whom:                         shigeri <shigeri@m10.alpha-net.ne.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sylpheed
-PORTVERSION=	2.2.0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
-
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk20
-GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-
-# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-ipv6 \
-		--prefix=${PREFIX} \
-		--with-libintl-prefix=${LOCALBASE} \
-		--program-transform-name=''
-
-CONFLICTS=	sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]*
-
-OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
-		COMPFACE	"Enable X-Face support." off \
-		JPILOT		"Enable JPilot support." off \
-		LDAP		"Enable LDAP support." off \
-		SSL		"Enable OpenSSL support." on \
-		GTKSPELL	"Enable Spell checking support" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
-
-.if defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme.15:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
-
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
-
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=--disable-jpilot
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if defined(WITH_GTKSPELL)
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
-CONFIGURE_ARGS+=--enable-gtkspell
-.else
-CONFIGURE_ARGS+=--disable-gtkspell
-.endif
-
-.if defined(WITH_GNOME)
-PLIST_FILES=	share/gnome/applications/sylpheed.desktop \
-		share/gnome/pixmaps/sylpheed.png
-.endif
-
-MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
-		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
-		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in libsylph/Makefile.in \
-		src/icons/Makefile.in
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
-		${WRKSRC}/libsylph/procmime.c
-
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src po manual faq$$|SUBDIRS = ac libsylph src po|g' \
-		${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
-	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
-		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
-		${WRKSRC}/${i}
-.endfor
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
-.endfor
-.endif
-.if defined(WITH_GNOME)
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/gnome/pixmaps/
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/applications/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
deleted file mode 100644
index 2b6787e9e8ef..000000000000
--- a/mail/sylpheed3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (sylpheed-2.2.0.tar.bz2) = da23e5c6ef869c4fe847ea9207f40ddf
-SHA256 (sylpheed-2.2.0.tar.bz2) = 72724821199dd92d9bb0068fc88054fc0144144889af7dc6dfea9ea4ae607a6c
-SIZE (sylpheed-2.2.0.tar.bz2) = 2492789
diff --git a/mail/sylpheed3/files/patch-libsylph-defs.h b/mail/sylpheed3/files/patch-libsylph-defs.h
deleted file mode 100644
index 7881004694d3..000000000000
--- a/mail/sylpheed3/files/patch-libsylph-defs.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- libsylph/defs.h.orig	Tue Sep 13 16:55:49 2005
-+++ libsylph/defs.h	Mon Sep 19 03:23:15 2005
-@@ -81,8 +81,8 @@
- #else
- #  define DEFAULT_SIGNATURE	".signature"
- #endif
--#define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
--#define DEFAULT_INC_PROGRAM	"inc"
-+#define DEFAULT_INC_PATH	""
-+#define DEFAULT_INC_PROGRAM	""
- /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
- /* #define DEFAULT_INC_PROGRAM	"imget" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
-@@ -91,7 +91,7 @@
- #ifdef _PATH_MAILDIR
- #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
- #else
--#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
- #endif
- 
- #define BUFFSIZE			8192
diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr
deleted file mode 100644
index 3107ae5ca582..000000000000
--- a/mail/sylpheed3/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+ 2, running on
-X Window System, and aiming for:
-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-WWW: http://sylpheed.good-day.net/
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
deleted file mode 100644
index e373d69521aa..000000000000
--- a/mail/sylpheed3/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/sylpheed
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ja
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.ja
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/lt/LC_MESSAGES/sylpheed.mo
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/vi/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-21.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-22.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/lt/LC_MESSAGES
-@dirrmtry share/locale/lt
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
deleted file mode 100644
index 35a80ff3e8b8..000000000000
--- a/mail/thunderbird-esr/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for:	mozilla-thunderbird
-# Date created:			4 September 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
-#
-
-PORTNAME=	thunderbird
-DISTVERSION=	1.5
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
-
-WANT_GNOME=	yes
-ALL_TARGET=	default
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GCC=	3.4+
-CFLAGS+=	-I${X11BASE}/include
-
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
-MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
-MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
-
-.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) || ${ARCH} == "sparc64"
-IGNORE=	core dumps at runtime
-.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) || ${ARCH} == "sparc64"
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif # ${PERL_LEVEL} < 500600
-
-post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}/defaults
-	@cd ${FAKEDIR}/lib/${PORTNAME}/defaults/isp && \
-		${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/defaults/isp/|' >> ${PLIST} && \
-		${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/defaults/isp/|' \
-		>> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
deleted file mode 100644
index 8b15b73e525b..000000000000
--- a/mail/thunderbird-esr/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-1.5-source.tar.bz2) = 781c1cd1a01583d9b666d8c2fe4288e6
-SHA256 (thunderbird-1.5-source.tar.bz2) = f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
-SIZE (thunderbird-1.5-source.tar.bz2) = 35028308
diff --git a/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl b/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/mail/thunderbird-esr/files/moz_pis_S50cleanhome b/mail/thunderbird-esr/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392043..000000000000
--- a/mail/thunderbird-esr/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
-    sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
-	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
-	| while read dir
-    do
-	[ ! -d "${dir}" ] && continue
-	# at last, debian do this, we do for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/mail/thunderbird-esr/files/patch-Double.cpp b/mail/thunderbird-esr/files/patch-Double.cpp
deleted file mode 100644
index 5cd13e4ff4fe..000000000000
--- a/mail/thunderbird-esr/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
-+++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
-@@ -51,10 +51,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -75,22 +75,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d310..000000000000
--- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh	Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/mail/thunderbird-esr/files/patch-config-rules.mk b/mail/thunderbird-esr/files/patch-config-rules.mk
deleted file mode 100644
index ecc3c8194dcc..000000000000
--- a/mail/thunderbird-esr/files/patch-config-rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
-+++ config/rules.mk	Sun Feb  1 15:11:41 2004
-@@ -444,7 +444,11 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
- 
diff --git a/mail/thunderbird-esr/files/patch-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fbde0..000000000000
--- a/mail/thunderbird-esr/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird-esr/files/patch-libm b/mail/thunderbird-esr/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/mail/thunderbird-esr/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
-+++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
- 
--FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK	= jsmathtemp.o
- JS_SAFE_ARENA	= 1
-@@ -320,7 +319,4 @@
- endif
- 	@$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
- 
---- js/Makefile.in	Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in	Thu Aug  4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd28d7..000000000000
--- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig	Mon Apr  4 15:08:49 2005
-+++ mail/app/mozilla.in	Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export	MRE_HOME
- 
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird-esr/files/patch-nopangoxft b/mail/thunderbird-esr/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c4864e..000000000000
--- a/mail/thunderbird-esr/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3e0e14acaaf2..000000000000
--- a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -71,7 +75,11 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/mail/thunderbird-esr/files/patch-sysnss b/mail/thunderbird-esr/files/patch-sysnss
deleted file mode 100644
index d854cabc053a..000000000000
--- a/mail/thunderbird-esr/files/patch-sysnss
+++ /dev/null
@@ -1,178 +0,0 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
---- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
-+++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
-@@ -37,16 +37,7 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_MODULES \
- 	$(NULL)
- 
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
-@@ -132,9 +123,4 @@
- .nss.cleaned: .nss.checkout
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- 
-@@ -153,43 +139,4 @@
- ifeq ($(OS_ARCH),WINNT)
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
- endif
- 	$(MAKE) -C boot $@
-@@ -200,18 +147,4 @@
- 
- install::
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -227,9 +160,4 @@
- endif
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
-                   $(NULL)
- 
---- config/config.mk	Tue Oct 12 00:11:11 2004
-+++ config/config.mk	Tue Aug  2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS	= \
- 	$(LIBS_DIR) \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- 	-lsmime3 \
- 	-lssl3 \
-@@ -189,11 +188,5 @@
- endif
- 
--NSS_DEP_LIBS	= \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
--	$(NULL)
-+NSS_DEP_LIBS	=
- 
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
-     const char *possible_ckbi_locations[] = {
-       NS_GRE_DIR,
-+      NS_UNIX_LIB_DIR,
-       NS_XPCOM_CURRENT_PROCESS_DIR
-     };
-@@ -419,5 +424,5 @@
-       }
- 
--      char *fullModuleName = nsnull;
-+      char *fullModuleName;
- #ifdef XP_MAC
-       nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
-       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+      if (fullModuleName == nsnull)
-+        continue;
-+      struct stat sb;
-+      if (stat(fullModuleName, &sb)) {
-+        if (errno != ENOENT)
-+          perror(fullModuleName);
-+        continue;
-+      }
-       /* If a module exists with the same name, delete it. */
-       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896d48..000000000000
--- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Mon May  3 13:05:12 2004
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
diff --git a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a7a7..000000000000
--- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird-esr/files/patch-xptcall-alpha b/mail/thunderbird-esr/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/mail/thunderbird-esr/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird-esr/files/patch-xptcall-sparc64 b/mail/thunderbird-esr/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/mail/thunderbird-esr/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f50ea..000000000000
--- a/mail/thunderbird-esr/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird-esr/pkg-deinstall.in b/mail/thunderbird-esr/pkg-deinstall.in
deleted file mode 100644
index c921e64d63d8..000000000000
--- a/mail/thunderbird-esr/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird-esr/pkg-descr b/mail/thunderbird-esr/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird-esr/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language.  See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.com/thunderbird/
diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in
deleted file mode 100644
index 39e08dad1695..000000000000
--- a/mail/thunderbird-esr/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
deleted file mode 100644
index 35a80ff3e8b8..000000000000
--- a/mail/thunderbird3/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for:	mozilla-thunderbird
-# Date created:			4 September 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
-#
-
-PORTNAME=	thunderbird
-DISTVERSION=	1.5
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
-
-WANT_GNOME=	yes
-ALL_TARGET=	default
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GCC=	3.4+
-CFLAGS+=	-I${X11BASE}/include
-
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
-MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
-MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
-
-.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) || ${ARCH} == "sparc64"
-IGNORE=	core dumps at runtime
-.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) || ${ARCH} == "sparc64"
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif # ${PERL_LEVEL} < 500600
-
-post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}/defaults
-	@cd ${FAKEDIR}/lib/${PORTNAME}/defaults/isp && \
-		${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/defaults/isp/|' >> ${PLIST} && \
-		${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/defaults/isp/|' \
-		>> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
deleted file mode 100644
index 8b15b73e525b..000000000000
--- a/mail/thunderbird3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-1.5-source.tar.bz2) = 781c1cd1a01583d9b666d8c2fe4288e6
-SHA256 (thunderbird-1.5-source.tar.bz2) = f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
-SIZE (thunderbird-1.5-source.tar.bz2) = 35028308
diff --git a/mail/thunderbird3/files/extra-patch-config_make-jars.pl b/mail/thunderbird3/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/mail/thunderbird3/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/mail/thunderbird3/files/moz_pis_S50cleanhome b/mail/thunderbird3/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392043..000000000000
--- a/mail/thunderbird3/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
-    sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
-	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
-	| while read dir
-    do
-	[ ! -d "${dir}" ] && continue
-	# at last, debian do this, we do for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/mail/thunderbird3/files/patch-Double.cpp b/mail/thunderbird3/files/patch-Double.cpp
deleted file mode 100644
index 5cd13e4ff4fe..000000000000
--- a/mail/thunderbird3/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
-+++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
-@@ -51,10 +51,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -75,22 +75,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d310..000000000000
--- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh	Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/mail/thunderbird3/files/patch-config-rules.mk b/mail/thunderbird3/files/patch-config-rules.mk
deleted file mode 100644
index ecc3c8194dcc..000000000000
--- a/mail/thunderbird3/files/patch-config-rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
-+++ config/rules.mk	Sun Feb  1 15:11:41 2004
-@@ -444,7 +444,11 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
- 
diff --git a/mail/thunderbird3/files/patch-config_autoconf.mk.in b/mail/thunderbird3/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fbde0..000000000000
--- a/mail/thunderbird3/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird3/files/patch-libm b/mail/thunderbird3/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/mail/thunderbird3/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
-+++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
- 
--FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK	= jsmathtemp.o
- JS_SAFE_ARENA	= 1
-@@ -320,7 +319,4 @@
- endif
- 	@$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
- 
---- js/Makefile.in	Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in	Thu Aug  4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd28d7..000000000000
--- a/mail/thunderbird3/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig	Mon Apr  4 15:08:49 2005
-+++ mail/app/mozilla.in	Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export	MRE_HOME
- 
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird3/files/patch-nopangoxft b/mail/thunderbird3/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c4864e..000000000000
--- a/mail/thunderbird3/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3e0e14acaaf2..000000000000
--- a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -71,7 +75,11 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/mail/thunderbird3/files/patch-sysnss b/mail/thunderbird3/files/patch-sysnss
deleted file mode 100644
index d854cabc053a..000000000000
--- a/mail/thunderbird3/files/patch-sysnss
+++ /dev/null
@@ -1,178 +0,0 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
---- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
-+++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
-@@ -37,16 +37,7 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_MODULES \
- 	$(NULL)
- 
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
-@@ -132,9 +123,4 @@
- .nss.cleaned: .nss.checkout
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- 
-@@ -153,43 +139,4 @@
- ifeq ($(OS_ARCH),WINNT)
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
- endif
- 	$(MAKE) -C boot $@
-@@ -200,18 +147,4 @@
- 
- install::
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -227,9 +160,4 @@
- endif
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
-                   $(NULL)
- 
---- config/config.mk	Tue Oct 12 00:11:11 2004
-+++ config/config.mk	Tue Aug  2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS	= \
- 	$(LIBS_DIR) \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- 	-lsmime3 \
- 	-lssl3 \
-@@ -189,11 +188,5 @@
- endif
- 
--NSS_DEP_LIBS	= \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
--	$(NULL)
-+NSS_DEP_LIBS	=
- 
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
-     const char *possible_ckbi_locations[] = {
-       NS_GRE_DIR,
-+      NS_UNIX_LIB_DIR,
-       NS_XPCOM_CURRENT_PROCESS_DIR
-     };
-@@ -419,5 +424,5 @@
-       }
- 
--      char *fullModuleName = nsnull;
-+      char *fullModuleName;
- #ifdef XP_MAC
-       nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
-       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+      if (fullModuleName == nsnull)
-+        continue;
-+      struct stat sb;
-+      if (stat(fullModuleName, &sb)) {
-+        if (errno != ENOENT)
-+          perror(fullModuleName);
-+        continue;
-+      }
-       /* If a module exists with the same name, delete it. */
-       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896d48..000000000000
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Mon May  3 13:05:12 2004
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a7a7..000000000000
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird3/files/patch-xptcall-alpha b/mail/thunderbird3/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird3/files/patch-xptcall-sparc64 b/mail/thunderbird3/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/mail/thunderbird3/files/thunderbird.desktop.in b/mail/thunderbird3/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f50ea..000000000000
--- a/mail/thunderbird3/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird3/pkg-deinstall.in b/mail/thunderbird3/pkg-deinstall.in
deleted file mode 100644
index c921e64d63d8..000000000000
--- a/mail/thunderbird3/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird3/pkg-descr b/mail/thunderbird3/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird3/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language.  See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.com/thunderbird/
diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in
deleted file mode 100644
index 39e08dad1695..000000000000
--- a/mail/thunderbird3/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 81bfb5cbe144..3bd64ead08ab 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.planetmirror.com/pub/horde/turba/		\
@@ -39,12 +39,12 @@ USE_PHP=	ldap
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
 DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
+CONFFILE=	attributes.php menu.php mime_drivers.php prefs.php sources.php
 SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index eb17ec4654db..c2a29941365f 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
+MD5 (turba-h3-2.1.tar.gz) = 2841adb1f8b7b17fd3e17cd14abdd36f
+SHA256 (turba-h3-2.1.tar.gz) = 1623f8e8b8b67965706a2e2cf039956a3957bc56531fbe0bfbad39cb83143125
+SIZE (turba-h3-2.1.tar.gz) = 1450847
diff --git a/mail/turba/files/patch-config::sources.php.dist b/mail/turba/files/patch-config::sources.php.dist
index 46b4a1ba4f5c..52bf06d5d79c 100644
--- a/mail/turba/files/patch-config::sources.php.dist
+++ b/mail/turba/files/patch-config::sources.php.dist
@@ -1,36 +1,48 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
+--- config/sources.php.dist.orig	Mon Nov  7 11:03:26 2005
++++ config/sources.php.dist	Wed Mar  8 23:18:05 2006
+@@ -490,109 +490,109 @@
+ // configuration at all - in case we don't have at least a 3.0.6 Horde
+ // install.  (In that case, be sure to change the params array below to suit
+ // your needs).
 -if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 -    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
+-    // First, get the user name to login to IMSP server with.
 -    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 -    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 -    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
+-        $uid = Auth::getBareAuth();
 -        $pass = Auth::getCredential('password');
 -    }
--
--    $cfgSources['imsp'] = array(
+-    // Note we always use the horde username to append to the key even if we
+-    // have an alternate username set in prefs.  This is to prevent the
+-    // (fringe) case where an IMSP username for one user might be a valid
+-    // horde username for another user.
+-    $cfgKey = 'IMSP_' . Auth::getAuth();
+-    $cfgSources[$cfgKey] = array(
 -        'title' => _("IMSP"),
 -        'type' => 'imsp',
 -        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
+-            'server'  => $GLOBALS['conf']['imsp']['server'],
+-            'port'    => $GLOBALS['conf']['imsp']['port'],
 -            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
+-            // socket, command, and auth_mechanism are for imtest driver.
+-            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
+-                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
+-                         '',
+-            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
+-                         $GLOBALS['conf']['imsp']['command'] : '' ,
+-            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
+-                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 -            'username' => $uid,
 -            'password' => $pass,
 -            'name' => $uid,
 -            'group_id_field' => 'group',
 -            'group_id_value' => 'group',
--            'contact_ownership' => false
+-            'contact_ownership' => false,
+-            // Dynamically generated acl rights for current user.
+-            'my_rights' => '',
+-            // Flags this as the user's 'root' IMSP address book.
+-            'is_root' => true
 -            ),
 -        'map' => array(
 -            '__key' => 'name',
@@ -57,28 +69,38 @@
 -            'homePhone'
 -            ),
 -        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
+-        'export' => true,
+-        'browse' => true,
 -        );
 -
 -    /**
 -     * Get any other address books this user might be privy to.
+-     * The values for attributes such as 'export' and 'browse' for books
+-     * that are added below will be the same as the values set in the default
+-     * book above. Any entries defined explicitly in cfgSources[]
+-     * will override any entries gathered dynamically below.
 -     */
 -    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
+-    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
+-    $count = 2;
 -    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
+-        $resultCount = count($result);
+-        for ($i = 0; $i < $resultCount; $i++) {
+-            // Make sure we didn't define this source explicitly,
+-            // but set the acls from the server regardless.
 -            $dup = false;
--            foreach ($cfgSources as $thisSource) {
+-            foreach ($cfgSources as $key => $thisSource) {
 -                if (($thisSource['type'] == 'imsp') &&
 -                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+-
 -                    $dup = true;
+-                    $acl = $result[$i]['params']['my_rights'];
+-                    $cfgSources[$key]['params']['my_rights'] = $acl;
+-                    break;
 -                }
 -            }
 -            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 -            }
 -        }
 -    } else {
@@ -87,31 +109,43 @@
 -}
 +//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 +//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
++//UNCOMMENTIFIMSP    // First, get the user name to login to IMSP server with.
 +//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 +//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 +//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP        $uid = Auth::getBareAuth();
 +//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
 +//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP    // Note we always use the horde username to append to the key even if we
++//UNCOMMENTIFIMSP    // have an alternate username set in prefs.  This is to prevent the
++//UNCOMMENTIFIMSP    // (fringe) case where an IMSP username for one user might be a valid
++//UNCOMMENTIFIMSP    // horde username for another user.
++//UNCOMMENTIFIMSP    $cfgKey = 'IMSP_' . Auth::getAuth();
++//UNCOMMENTIFIMSP    $cfgSources[$cfgKey] = array(
 +//UNCOMMENTIFIMSP        'title' => _("IMSP"),
 +//UNCOMMENTIFIMSP        'type' => 'imsp',
 +//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
++//UNCOMMENTIFIMSP            'server'  => $GLOBALS['conf']['imsp']['server'],
++//UNCOMMENTIFIMSP            'port'    => $GLOBALS['conf']['imsp']['port'],
 +//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
++//UNCOMMENTIFIMSP            // socket, command, and auth_mechanism are for imtest driver.
++//UNCOMMENTIFIMSP            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
++//UNCOMMENTIFIMSP                         '',
++//UNCOMMENTIFIMSP            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['command'] : '' ,
++//UNCOMMENTIFIMSP            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
++//UNCOMMENTIFIMSP                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 +//UNCOMMENTIFIMSP            'username' => $uid,
 +//UNCOMMENTIFIMSP            'password' => $pass,
 +//UNCOMMENTIFIMSP            'name' => $uid,
 +//UNCOMMENTIFIMSP            'group_id_field' => 'group',
 +//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
++//UNCOMMENTIFIMSP            'contact_ownership' => false,
++//UNCOMMENTIFIMSP            // Dynamically generated acl rights for current user.
++//UNCOMMENTIFIMSP            'my_rights' => '',
++//UNCOMMENTIFIMSP            // Flags this as the user's 'root' IMSP address book.
++//UNCOMMENTIFIMSP            'is_root' => true
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'map' => array(
 +//UNCOMMENTIFIMSP            '__key' => 'name',
@@ -138,34 +172,44 @@
 +//UNCOMMENTIFIMSP            'homePhone'
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
++//UNCOMMENTIFIMSP        'export' => true,
++//UNCOMMENTIFIMSP        'browse' => true,
 +//UNCOMMENTIFIMSP        );
 +//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP    /**
 +//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
++//UNCOMMENTIFIMSP     * The values for attributes such as 'export' and 'browse' for books
++//UNCOMMENTIFIMSP     * that are added below will be the same as the values set in the default
++//UNCOMMENTIFIMSP     * book above. Any entries defined explicitly in cfgSources[]
++//UNCOMMENTIFIMSP     * will override any entries gathered dynamically below.
 +//UNCOMMENTIFIMSP     */
 +//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
++//UNCOMMENTIFIMSP    $count = 2;
 +//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP        $resultCount = count($result);
++//UNCOMMENTIFIMSP        for ($i = 0; $i < $resultCount; $i++) {
++//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly,
++//UNCOMMENTIFIMSP            // but set the acls from the server regardless.
 +//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP            foreach ($cfgSources as $key => $thisSource) {
 +//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
 +//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP                    $dup = true;
++//UNCOMMENTIFIMSP                    $acl = $result[$i]['params']['my_rights'];
++//UNCOMMENTIFIMSP                    $cfgSources[$key]['params']['my_rights'] = $acl;
++//UNCOMMENTIFIMSP                    break;
 +//UNCOMMENTIFIMSP                }
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP        }
 +//UNCOMMENTIFIMSP    } else {
 +//UNCOMMENTIFIMSP        $notification->push($result);
 +//UNCOMMENTIFIMSP    }
 +//UNCOMMENTIFIMSP}
+ /* End IMSP sources. */
  
  /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/turba/files/pkg-message.in b/mail/turba/files/pkg-message.in
index f7347f3f3413..6243e33a282d 100644
--- a/mail/turba/files/pkg-message.in
+++ b/mail/turba/files/pkg-message.in
@@ -7,6 +7,10 @@ Horde must be configured; if not, see `pkg_info -D -x horde'.
 Then, you might have to tune the configuration files located in
 %%CONFDIR%%/, specially the file sources.php.
 
+Warning: if you don't use some source, deactivate it, or you could
+******** experience bad response times!
+         When upgrading from Turba 2.0.x, please read UPGRADING.
+
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
@@ -14,8 +18,5 @@ You have to create a table in your database; please see
 %%TURBADIR%%/scripts/.
 You might create a LDAP schema: please see the doc LDAP.
 
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index 07ea12b087a2..f6fd94a1e219 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%TURBADIR%%/add.php
+%%TURBADIR%%/addressbooks.php
 %%TURBADIR%%/browse.php
 %%TURBADIR%%/config/.htaccess
 %%TURBADIR%%/config/attributes.php
@@ -14,6 +15,8 @@
 %%TURBADIR%%/config/conf.xml
 %%TURBADIR%%/config/menu.php
 %%TURBADIR%%/config/menu.php.dist
+%%TURBADIR%%/config/mime_drivers.php
+%%TURBADIR%%/config/mime_drivers.php.dist
 %%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/prefs.php.dist
 %%TURBADIR%%/config/sources.php
@@ -26,16 +29,19 @@
 %%TURBADIR%%/lib/.htaccess
 %%TURBADIR%%/lib/AbstractObject.php
 %%TURBADIR%%/lib/Block/minisearch.php
+%%TURBADIR%%/lib/Block/tree_menu.php
 %%TURBADIR%%/lib/Driver.php
 %%TURBADIR%%/lib/Driver/imsp.php
 %%TURBADIR%%/lib/Driver/kolab.php
 %%TURBADIR%%/lib/Driver/ldap.php
+%%TURBADIR%%/lib/Driver/null.php
 %%TURBADIR%%/lib/Driver/prefs.php
 %%TURBADIR%%/lib/Driver/sql.php
 %%TURBADIR%%/lib/Group.php
 %%TURBADIR%%/lib/List.php
 %%TURBADIR%%/lib/ListView.php
 %%TURBADIR%%/lib/Object.php
+%%TURBADIR%%/lib/Object/Group.php
 %%TURBADIR%%/lib/ObjectView.php
 %%TURBADIR%%/lib/Renderer.php
 %%TURBADIR%%/lib/Turba.php
@@ -57,11 +63,13 @@
 %%TURBADIR%%/locale/es_ES/help.xml
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fa_IR/help.xml
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
@@ -83,6 +91,7 @@
 %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/tr_TR/help.xml
 %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -103,6 +112,7 @@
 %%TURBADIR%%/po/fr_FR.po
 %%TURBADIR%%/po/gl_ES.po
 %%TURBADIR%%/po/hu_HU.po
+%%TURBADIR%%/po/is_IS.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
@@ -127,10 +137,12 @@
 %%TURBADIR%%/po/zh_TW.po
 %%TURBADIR%%/scripts/.htaccess
 %%TURBADIR%%/scripts/Turba.reg
+%%TURBADIR%%/scripts/import_vcards.php
 %%TURBADIR%%/scripts/ldap/addou
 %%TURBADIR%%/scripts/ldap/addou.pl
 %%TURBADIR%%/scripts/ldap/core.schema.patch
 %%TURBADIR%%/scripts/ldap/rfc2739.schema
+%%TURBADIR%%/scripts/sql/turba_objects.mssql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
 %%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
@@ -138,8 +150,10 @@
 %%TURBADIR%%/scripts/sql/turba_weddingguests.sql
 %%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
 %%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
+%%TURBADIR%%/scripts/upgrades/public_to_horde_share.php
 %%TURBADIR%%/search.php
 %%TURBADIR%%/templates/.htaccess
+%%TURBADIR%%/templates/addressbooks.inc
 %%TURBADIR%%/templates/block/minisearch.inc
 %%TURBADIR%%/templates/browse/actions.inc
 %%TURBADIR%%/templates/browse/column_footers.inc
@@ -149,14 +163,16 @@
 %%TURBADIR%%/templates/browse/footerAlpha.inc
 %%TURBADIR%%/templates/browse/header.inc
 %%TURBADIR%%/templates/browse/javascript.inc
+%%TURBADIR%%/templates/browse/row.inc
 %%TURBADIR%%/templates/browse/search.inc
 %%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
 %%TURBADIR%%/templates/common-header.inc
 %%TURBADIR%%/templates/data/export.inc
 %%TURBADIR%%/templates/data/import.inc
 %%TURBADIR%%/templates/menu.inc
+%%TURBADIR%%/templates/prefs/addressbookselect.inc
 %%TURBADIR%%/templates/prefs/columnselect.inc
+%%TURBADIR%%/templates/prefs/imsp_opt.inc
 %%TURBADIR%%/test.php
 %%TURBADIR%%/themes/graphics/contact.png
 %%TURBADIR%%/themes/graphics/favicon.ico
@@ -165,97 +181,103 @@
 %%TURBADIR%%/themes/graphics/menu/new.png
 %%TURBADIR%%/themes/graphics/new.png
 %%TURBADIR%%/themes/graphics/turba.png
+%%TURBADIR%%/themes/ideas/screen.css
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
+%%TURBADIR%%/view.php
 %%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/themes/ideas
 @dirrm %%TURBADIR%%/themes/graphics/menu
 @dirrm %%TURBADIR%%/themes/graphics
 @dirrm %%TURBADIR%%/themes
+@dirrm %%TURBADIR%%/templates/prefs
+@dirrm %%TURBADIR%%/templates/data
+@dirrm %%TURBADIR%%/templates/browse
+@dirrm %%TURBADIR%%/templates/block
+@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/scripts/upgrades
+@dirrm %%TURBADIR%%/scripts/sql
+@dirrm %%TURBADIR%%/scripts/ldap
+@dirrm %%TURBADIR%%/scripts
+@dirrm %%TURBADIR%%/po
+@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_TW
+@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_CN
+@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/uk_UA
+@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/tr_TR
+@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sv_SE
+@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sl_SI
+@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sk_SK
+@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ru_RU
+@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ro_RO
+@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_PT
+@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_BR
+@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pl_PL
+@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nn_NO
+@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nb_NO
+@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/mk_MK
+@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lv_LV
+@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lt_LT
+@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ko_KR
+@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ja_JP
+@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/it_IT
+@dirrm %%TURBADIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/is_IS
+@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/hu_HU
+@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/gl_ES
+@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fr_FR
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
+@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fa_IR
+@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/et_EE
+@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/en_US
+@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/el_GR
+@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/de_DE
+@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/da_DK
+@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/cs_CZ
+@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ca_ES
+@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/bg_BG
+@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ar_SY
+@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/Object
+@dirrm %%TURBADIR%%/lib/Driver
+@dirrm %%TURBADIR%%/lib/Block
+@dirrm %%TURBADIR%%/lib
 @dirrmtry %%TURBADIR%%/config
 @dirrmtry %%TURBADIR%%