--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/editsieve
+++ cyrus-imapd-2.2-2.2.13/debian/examples/editsieve
@@ -0,0 +1,252 @@
+#!/bin/bash 
+#
+# This script is copyright 2006 Sven Mueller <cyrus@incase.de>
+# Released under the terms of the GNU General public license
+# (GPL) version 2
+# Before distributing changed versions of the script, please ask
+# the original author to include your changes into the original
+# distribution files. Thanks.
+#
+umask 077
+
+# generic defaults
+
+DEFAULTDOMAIN=incase.de
+DEFAULTHOST=localhost
+DEFAULTCONFDIR="${HOME}/.editsieve"
+
+# report usage help
+function usage () {
+	echo "Usage: $0 -h"
+	echo "       $0 --help"
+	echo "       $0 [-c <confdir>] [-n <scriptname>] [-d <domain>|--domain <domain>] "
+	echo "               [-p <password>] [-s <server>] <user>"
+	echo "Parameters:"
+	echo "  -h|--help                     : Display this help"
+	echo "  -c <dir> | --confdir <dir>    : Directory to store configuration and other"
+	echo "                                  data in (like the user's sieve script)."
+	echo "                                  The directory will be created if necessary."
+	echo "                                  Default: ${DEFAULTCONFDIR}"
+	echo "  -d <domain>|--domain <domain> : Specify domain for the user."
+	echo "                                  Default: ${DEFAULTDOMAIN}"
+	echo "  -n <script>|--name <script>   : Use <script> as the name of the script to"
+	if [ "$SCRIPTNAME" ]; then
+	    echo "                                  handle. Default: ${SCRIPTNAME}"
+	else
+	    echo "                                  handle. Default: <user>_<domain>"
+	fi
+	echo "  -s <host> | --server <host>   : Use <host> as the host to connect to."
+	echo "                                  Default: ${DEFAULTHOST}" 
+	echo "  -p <pwd> | --password <pwd>   : Deprecated: Define password to pass to"
+	echo "                                  sieveshell (also on commandline). Using this"
+	echo "                                  option might be convenient, but it is a"
+	echo "                                  security risk. Default: Let sieveshell ask"
+	echo "  <user>                        : User for which to edit the"
+	echo "                                  sieve script. If specified as"
+	echo "                                  user@do.main, use do.main as "
+	echo "                                  the users domain."
+	echo "Note that a conflict between the domain specified with the"
+	echo "--domain parameter and a user specified in @do.main notation"
+	echo "will cause this script to abort."
+	echo 
+}
+
+# Set initial values
+
+USER=""
+CONFDIR="${DEFAULTCONFDIR}"
+HOST="${DEFAULTHOST}"
+
+while [ $# -gt 0 ]; do
+	case "${1}" in
+		-d|--domain)
+			DOMAIN="${2}"
+			shift
+			shift
+			;;
+		-c|--confdir)
+			CONFDIR="${2}"
+			shift
+			shift
+			;;
+		-n|--script|--name)
+			SCRIPTNAME="${2}"
+			shift
+			shift
+			;;
+		-p|--pass*)
+			PASSWORD="-p ${2}"
+			echo "WARNING: Passing passwords on the commandline is a potential security hazard."
+			shift
+			shift
+			;;
+		-s|--server|--host)
+			HOST="$2"
+			shift
+			shift
+			;;
+		-h|--help)
+			usage
+			exit 0
+			;;
+		*)
+			# If USER had already been set, reaching this point
+			# means a second user was named. If so: report an error
+			# and show usage help.
+			if [ "${USER}" != "" ]; then
+				usage
+				echo ""
+				echo "ERROR: Multiple users specified" >&2
+				exit 1
+			fi
+			USER=$1
+			shift
+			;;
+	esac
+done
+
+# check wether a username had been specified
+if [ "${USER}" = "" ]; then
+	echo "ERROR: No user specified" >&2
+	usage
+	exit 1
+fi
+
+# If we can't create files inside ${CONFDIR}, try to create a directory named ${CONFDIR}
+if ! touch "${CONFDIR}"/testfile; then
+	if [ -e "${CONFDIR}" ]; then
+		echo "ERROR: ${CONFDIR} exists, but is no directory or link to a directory"
+		exit 1
+	fi
+	if ! mkdir "${CONFDIR}" ; then
+		echo "ERROR: ${CONFDIR} doesn't exist and can't be created"
+		exit 1
+	fi
+else
+	rm -f "${CONFDIR}/testfile"
+fi
+
+# check wether the domain had been specified
+if [ "${DOMAIN}" = "" ]; then
+	# if the user was specified as user@domain, use the domainpart from there
+	if echo "${USER}" | grep -q "@" ; then
+		DOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+		USER=`echo "${USER}" | sed -e 's/@.*//'`
+	else
+		# if no domain was specified and the username didn't include the domain,
+		# use the default domain.
+		DOMAIN="${DEFAULTDOMAIN}"
+	fi
+else
+	# DOMAIN had been specified. Check for username in user@domain form
+	if echo "${USER}" | grep -q "@" ; then
+		# Yes, user was specified as user@domain
+		UDOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+		USER=`echo "${USER}" | sed -e 's/@.*//'`
+		# check wether the domain specified using the --domain switch
+		# conflicts with the one given using the user@domain notation
+		if [ "${UDOMAIN}" != "${DOMAIN}" ]; then
+			# yes they conflict: Abort with suitable error message
+			echo "ERROR: Domain part specified in username but conflicts with"\
+			     "domain specified in -d parameter" >&2
+			exit 1
+		fi
+	fi
+fi
+
+# Set SCRIPTNAME to ${USER}_${DOMAIN} if not already set
+SCRIPTNAME="${SCRIPTNAME:-${USER}_${DOMAIN}}"
+
+echo "Trying to fetch script for ${USER}@${DOMAIN} from ${HOST}"
+if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" \
+              ${PASSWOIRD} -e "get ${SCRIPTNAME} ${CONFDIR}/${SCRIPTNAME}" ${HOST}
+then
+	# fetch was successfull, keep a copy for later
+	cp -f "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.orig"
+else
+	# an error occured while downloading.
+	echo WARNING: Unable to download script >&2 
+	if [ ! -f "${CONFDIR}/${SCRIPTNAME}" ]; then
+	        # there is no pre-existing script in $CONFDIR, 
+		# create a default script
+		echo starting with a default script. >&2
+		# <<-EOF is like <<EOF except that it removes
+		# as much whitespace from the beginning of lines
+		# as there is in the first line
+		cat > "${CONFDIR}/${SCRIPTNAME}" <<-EOF
+		# Mail rules for ${USER}@${DOMAIN}
+		#
+		# load fileinto extension
+		require ["fileinto"];
+		#
+		# file spam into special folder
+		if header :contains "X-Spam-Flag" "YES"
+		{
+		        fileinto "INBOX.Z_SPAM.suspected";
+		        stop;
+		}
+		#
+		EOF
+		echo -n "" > "${CONFDIR}/${SCRIPTNAME}.orig"
+	else
+		echo "${CONFDIR}/${SCRIPTNAME}.orig exists, using it." >&2
+	fi
+fi
+SYNTAXOK=0
+# if $EDITOR is non-empty, use that to call the editor.
+# otherwise, use vi
+EDITOR="${EDITOR:-vi}"
+while [ "$SYNTAXOK" = "0" ]; do
+	"${EDITOR}" "${CONFDIR}/${SCRIPTNAME}"
+	echo "trying to compile rules file"
+	if /usr/lib/cyrus/bin/sievec -C /etc/imapd.conf "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.bc" ; then
+		# all fine, sievec was able to compile the script, syntax is thus OK
+		rm "${CONFDIR}/${SCRIPTNAME}.bc"
+		SYNTAXOK=1
+	else
+		# There was some error compiling the script, askü user what to do
+		echo "ERROR: Compiling the script failed."
+		echo "Press 'e'+return (or just return) to edit the file again,"
+		echo "Press 's'+return for a shell (returns to editor after shell exits)"
+		echo "Predd 'a'+return or CTRL-C to abort."
+		echo "Press 'i'+return to ignore"
+		VALID=0
+		while [ "$VALID" = "0" ]; do
+			read a || exit 1
+			if [ "$a" = "i" ] || [ "$a" = "I" ]; then
+				# asume sievec had no problem
+				VALID=1
+				SYNTAXOK=1
+			elif  [ "$a" = "s" ] || [ "$a" = "S" ]; then
+				VALID=1
+				echo "The edited file can be found in ${CONFDIR}/${SCRIPTNAME}"
+				echo "After the shell terminates, you will be returned to the editor"
+				bash
+			elif [ "$a" = "a" ] || [ "$a" = "A" ]; then
+				exit 1
+			elif [ "$a" = "e" ] || [ "$a" = "E" ] || [ "$a" = "" ]; then
+				VALID=1
+			else
+				echo "INVALID CHOICE, try again."
+			fi
+		done
+	fi
+done
+echo "copying file ${SCRIPTNAME} to ${SCRIPTNAME}.edited"
+cp "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.edited"
+# check wether the file changed at all. If not, we can skip uploading
+echo trying diff
+if diff -q "${CONFDIR}/${SCRIPTNAME}.orig" "${CONFDIR}/${SCRIPTNAME}"; then
+	echo "Sieve rules unchanged, no upload needed."
+else
+	echo "Sieve rules changed, uploading and activating new file."
+	echo "${USER}@${DOMAIN}"
+	if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" -e "put ${CONFDIR}/${SCRIPTNAME}
+activate ${SCRIPTNAME}" ${HOST} ; then
+		rm -f "${CONFDIR}/${SCRIPTNAME}.edited" ; echo "Upload OK"
+	else
+		echo "Upload failed! Leaving edited file in ${SCRIPTNAME}.edited"
+	fi
+	rm "${CONFDIR}/${SCRIPTNAME}.orig"
+fi
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/README
+++ cyrus-imapd-2.2-2.2.13/debian/examples/README
@@ -0,0 +1,14 @@
+This directory contains some sample files that may be of use with Cyrus.
+
+mboxtocyrus	A script to import mbox format mailboxes into Cyrus
+		(by Michael-John Turner <mj@debian.org>
+
+syncldap2cyrus.pl retrieves a list of usernames from an LDAP server and
+                  then tries to create a user mailbox in Cyrus, and then
+		  any secondary mailboxes under that. The idea is that
+		  you could run this via cron or manually every time you
+		  add a user to your LDAP server, and they would then
+		  have a Cyrus mailbox. This script also has a report
+		  mode that shows you any users in LDAP that do not have
+		  a Cyrus mailbox, and vice versa.
+		(by Stuart Young (aka Cef) <cef@optus.net>)
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/README.imapcreate.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/README.imapcreate.pl
@@ -0,0 +1,23 @@
+Launching the script without any parameters will show a short help. It
+should be pretty self-explanatory.
+
+Here are some examples on how the script could be invoked:
+
+- this will read the file list.txt, and create the mailboxes listed in it
+  with a 50MB quota:
+
+  cat list.txt | ./imapcreate.pl -u cyradm -p 'cyrpass' -q 50M mail.example.com
+
+- this will create a mailbox for john, using the Unix Hierarchy separator,
+  no quota, in verbose mode:
+
+  ./imapcreate.pl -u cyradm -m john -s -v mail.example.com
+
+  the output would look like this:
+
+  Creating user.john on default
+
+This script is far from being perfect, but it works great for me. feel free
+to e-mail me about it, to report bugs, to send patches etc:
+
+clement.hermann@free.fr
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/imapcreate.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/imapcreate.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl -w
+# 
+# imapcreate: create IMAP mailboxes with quotas
+#			 Reads user names from standard input.
+# originally found on http://cyrus-utils.sourceforge.net
+# © 2001 Garry Mills  
+# 
+# enhanced by Clément "nodens" Hermann <clement.hermann@free.fr>
+#
+# I'd like to consider this as GPL'd (cf www.gnu.org), but won't add any
+# copyright without the original author's consent.
+# last modification : 2004/11/23
+# Changes : 
+# 2005/03/31	- Finally found out the original author's name.
+# 2004/11/23	- removed LOGIN as a default mech, now use cyrus' default
+#		- Added --auth option to specify mech
+#
+# TODO : fix STDIN collision when reading password AND mailboxes name from STDIN
+# 
+use Getopt::Long;
+use Cyrus::IMAP::Admin;
+use strict;
+
+# CLI options
+my ($debug,$user,$pass,$quota,@part,$useunixhierarchy,@mailboxes,$delete,$cyrus,$authmech);
+
+sub usage {
+  print "imapcreate - create IMAP mailboxes with quotas\n";
+  print "  usage:\n";
+  print "	imapcreate [-d] [-u user] [--auth mechanism] [-p pass] [-m mailbox1[,mailbox2][,mailbox<n>]] [-q quota] [-t partition:list]\n";
+  print "	[-s] [-v] <server>\n";
+  print "\n";
+  print "if -s is set, we'll use the unix hierarchy separator (see imapd.conf(1))\n";
+  print "if -d is set, we'll delete mailboxes instead of creating them\n";
+  print "You can use M or ,m to specify quotas. e.g. 10M. By default,\n";
+  print "the quota is expressed in Kbytes.\n";
+  print "If no password is submitted with -p, we'll prompt for one.\n";
+  print "if no mailbox name is specified with -m, read user names from standard input\n";
+  print "if -v is set, we'll run in debug mode, and print information on stdout\n";
+  print "\n";
+  print "The default mechanism is used for authentication. If you need another\nmechanism, (try LOGIN), use --auth <mechanism> option\n";
+  print "\n";
+  print "  example: \n";
+  print "	imapcreate -u cyradm -m foo,bar,joe -q 50000 -t p1:p2 mail.testing.umanitoba.ca\n";
+  print "\n";
+  exit 0;
+}
+
+# Create a mailbox... usage : &CreateMailBox(user,partition[,quota]).
+# You have to be authentified already. We use "$cyrus" as the connection name.
+# partition can be 'default'
+sub CreateMailBox {
+	my $mbuser = $_[0];
+	my $mbpart = $_[1];
+	my $mbquota = $_[2];
+	
+	print "Creating $mbuser on $mbpart\n" if $debug;
+	if ($mbpart eq 'default') {
+	$cyrus->createmailbox($mbuser);
+	}
+	else {
+	$cyrus->createmailbox($mbuser, $mbpart);
+	}
+	warn $cyrus->error if $cyrus->error;
+	
+	# Set the quota
+	if ($mbquota) {
+	print "Setting quota for $mbuser to $mbquota\n" if $debug;
+	$cyrus->setquota($mbuser, 'STORAGE', $mbquota);
+	warn $cyrus->error if $cyrus->error;
+	}
+}
+
+# Delete a mailbox. Usage: $DeleteMailBox($user)
+# Assuming we use $user as the admin.
+sub DeleteMailBox {
+	my $mbuser = $_[0];
+	my $delacl = "c";
+	
+	print "Deleting $mbuser\n" if $debug;
+	$cyrus->setaclmailbox($mbuser, $user, $delacl);
+	$cyrus->deletemailbox($mbuser);
+	warn $cyrus->error if $cyrus->error;
+}
+
+GetOptions( "d|delete" => \$delete, 
+	    "u|user=s" => \$user, 
+	    "auth=s" => \$authmech, 
+	    "p|pass=s" => \$pass, 
+	    "m|mailboxes=s" => \@mailboxes, 
+	    "q|quota=s" => \$quota,
+	    "s|UnixHierarchy" => \$useunixhierarchy, 
+	    "t|part=s" => \@part, 
+	    "v|verbose" => \$debug );
+
+@part = split(/:/, join(':', @part));
+push @part, 'default' unless @part;
+my $pn = 0;
+@mailboxes = split(/,/, join(',', @mailboxes));
+
+my $server = shift(@ARGV) if (@ARGV);
+usage unless $server;
+
+# quotas formatting:
+if ($quota) {
+	if ($quota =~ /^(\d+)([mk]?)$/i) {
+		my $numb = $1;
+		my $letter = $2;
+		if ($letter =~ /^m$/i) {
+			$quota = $numb * 1024;
+			print "debug: quota=$quota\n" if $debug;
+		} elsif ($letter =~ /^k$/i) {
+			$quota = $numb;
+			print "debug: quota=$quota\n" if $debug;
+		} else {
+			die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+#			$quota = $numb;
+#			print "debug: quota=$quota\n" if $debug;
+		}
+	} else {
+		die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+	}
+}
+
+# Authenticate
+$cyrus = Cyrus::IMAP::Admin->new($server);
+
+if ($authmech) {
+	$cyrus->authenticate(-mechanism => $authmech, 
+			-user => $user,
+	 		-password => $pass);
+} else {
+	$cyrus->authenticate(
+			-user => $user,
+	 		-password => $pass);
+}	
+die $cyrus->error if $cyrus->error;
+
+# if there isn't any mailbox defined yet, get them from standard input
+if (! (defined $mailboxes[0])) { 
+	# For all users
+	while (<>) {
+		chomp;
+		my $mbox = $_;
+		push @mailboxes, $mbox;
+	}
+}
+
+# create/delete mailboxes for each user
+foreach my $mailbox (@mailboxes) {
+	if ($useunixhierarchy) {
+	$mailbox = 'user/' . $mailbox;
+	} else {
+	$mailbox = 'user.' . $mailbox;
+	}
+
+	if ($delete) {
+		&DeleteMailBox($mailbox)
+	} else {
+		# Select the partition
+		my $pt = $part[$pn];
+		$pn += 1;
+		$pn = 0 unless $pn < @part;
+		&CreateMailBox($mailbox,$pt,$quota)
+	}
+}
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/mboxtocyrus
+++ cyrus-imapd-2.2-2.2.13/debian/examples/mboxtocyrus
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Script to import mbox-format mailboxes to Cyrus folders
+# Requires formail (from procmail)
+#
+# Note: As this runs cyrdeliver directly, you'll need to be
+#       a member of the mail group for it to work.
+#
+# Note2: Make sure the user 'postman' is listed as an lmtp_admin
+# that is allowed to proxy.
+#
+# Use this script at your own risk! I'm not responsible if
+# it trashes your mail system :)
+#
+# By Michael-John Turner <mj@debian.org>
+#
+# Changelog:
+#   Fri Dec  1 21:19:19 SAST 2000 
+#      - Incorporate some modifications from Tomas Pospisek <tpo@spin.ch>
+#
+
+USER=$1
+MAILBOX=$2
+CYRUSFOLDER=$3
+CYRDELIVER=/usr/sbin/cyrdeliver
+FORMAIL=/usr/bin/formail
+
+if ! [ -x "$FORMAIL" ]; then
+	echo ""
+	echo "formail (from procmail) is required to run this script"
+	echo ""
+	exit 1
+fi
+
+
+# This assumes id prints group names within parentheses
+if ! `id | grep -q "(mail)"`; then
+	echo ""
+	echo "You must be a member of the mail group to run this script"
+	echo ""
+	exit 1
+fi
+
+
+if [ "$USER" = "" ]; then
+	echo ""
+	echo "syntax: $0 user [mbox] [cyrus folder]"
+	echo ""
+	echo "If no mbox is specified, the user and mbox name are taken to be the same"
+	echo "If no cyrus folder is specified, the INBOX is used"
+	echo ""
+	exit 2
+fi
+
+
+
+if [ "$MAILBOX" == "" ]; then
+	MAILBOX=$USER
+fi
+
+if [ "$CYRUSFOLDER" == "" ]; then
+	echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
+	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
+ else
+	echo "Adding mailbox '$MAILBOX' to Cyrus folder '$CYRUSFOLDER' of user '$USER'..."
+	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER -a postman -m $CYRUSFOLDER $USER
+fi
+
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/syncldap2cyrus.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/syncldap2cyrus.pl
@@ -0,0 +1,324 @@
+#!/usr/bin/perl -w
+use strict;
+use vars qw($opt_a $opt_f $opt_n $opt_r);
+use Getopt::Std;
+use Net::LDAP;
+use Cyrus::IMAP::Admin;
+
+# Requires: Getopt::Std, Net::LDAP, Cyrus::IMAP::Admin
+# Debian pkgs: libnet-ldap-perl, libcyrus-imap-perl21
+
+# Script Title : syncldap2cyrus.pl
+# Written By   : Stuart Young (aka Cef) <cef@optus.net>
+# Last Modified: Mon Mar 14 23:59:14 UTC 2005
+# Description:
+#  syncldap2cyrus.pl retrieves a list of usernames from an LDAP server
+#  and then tries to create a user mailbox in Cyrus, and then any
+#  secondary mailboxes under that. The idea is that you could run this
+#  via cron or manually every time you add a user to your LDAP server,
+#  and they would then have a Cyrus mailbox. This script also has a
+#  report mode that shows you any users in LDAP that do not have a
+#  Cyrus mailbox, and vice versa.
+
+# Notes:
+#  This script is FREE. There is no support. If it breaks, you get to
+#  keep all the pieces.
+#  Please do not complain about the quality or style of this script,
+#  or you will be ignored.
+#  If you want to add SSL/TLS and/or inbuilt SASL support, go for it!
+#  Yes I know it will use a lot of memory if there are lots of users
+#  and/or mailboxes. Live with it, or rewrite it - your call.
+
+sub Usage ()
+{
+  return <<END;
+usage: syncldap2cyrus.pl [-a|-f|-n|-r]
+
+ -a : Add all users from LDAP to Cyrus
+ -f : Force creation of mailboxes even if they have errors (implies -a)
+ -n : Do not add users to Cyrus, just display (implies -a)
+ -r : Report on differences between LDAP and Cyrus only (implies -n)
+END
+}
+
+# No options, give a Usage message
+(scalar(@ARGV)) or
+  die Usage();
+
+getopts('afnr');
+
+# Get options
+my $addcyrus = 1;
+my $forcecreate = 0;
+my $report = 0;
+my $go = 0;
+
+if (defined($opt_a))
+{
+  $go = 1;
+}
+if (defined($opt_f))
+{
+  $go = 1;
+  $forcecreate = 1;
+}
+if (defined($opt_n))
+{
+  $go = 1;
+  $addcyrus = 0;
+}
+if (defined($opt_r))
+{
+  $go = 1;
+  $report = 1;
+  $addcyrus = 0;
+}
+
+# No regognised options, give a usage message
+if ($go == 0)
+{
+  die Usage();
+}
+
+# Settings - should come from config file(s) at some point
+
+# Debug mode, normally 0
+my $debug = 0;
+# Cyrus Host to connect to
+my $cyrus_host = 'localhost';
+# Cyrus admin user & password
+my $cyrus_admin = 'cyrus';
+my $cyrus_pass = 'secret';
+# Cyrus Unix Seperator - allow .'s in names (unixhierarchysep in cyrus)
+my $cyrus_unix_sep = 0;
+# LDAP server uri
+my $ldap_uri = 'ldap://localhost/';
+# LDAP bind domain & password
+my $ldap_bind_domain = 'cn=Manager, dc=example, dc=com';
+my $ldap_bind_pass = 'secret';
+# LDAP search base
+my $ldap_search_base = 'ou=People, dc=example, dc=com';
+# LDAP search scope
+my $ldap_search_scope = 'sub';
+# LDAP user attribute to return.
+my $ldap_user_attr = 'uid';
+# LDAP search query. Where possible, use $ldap_attr here to avoid
+# problems when changing the query
+my $ldap_search_query = "($ldap_user_attr=*)";
+# List of mailboxes to create for each user
+my @mboxlist = ('Trash', 'Sent', 'Spam', 'Drafts');
+
+# General vars
+my $count = 0;
+my $realuser = '';
+my $done = 0;
+
+# Connect to LDAP and bind
+my $ldap = Net::LDAP->new($ldap_uri) or
+  die "Can't connect to LDAP server at " . $ldap_uri;
+my $mesg = $ldap->bind ($ldap_bind_domain, password => $ldap_bind_pass);
+
+$mesg = $ldap->search ( base => $ldap_search_base,
+                        scope => $ldap_search_scope,
+                        filter => $ldap_search_query,
+                        attr => $ldap_user_attr );
+
+$mesg->code && die "LDAP error: " . $mesg->error;
+
+# Connect to Cyrus via IMAP
+my $client = 0;
+my $rc = 0;
+my $sepchar = '.';
+
+$client = Cyrus::IMAP::Admin->new("$cyrus_host");
+if ($debug == 1)
+{
+  print "Connecting to Cyrus using user: ". $cyrus_admin. "\n";
+}
+$rc = $client->authenticate(-user => $cyrus_admin, -password => $cyrus_pass) or
+  die "Can't authenticate to Cyrus on $cyrus_host as user: ". $cyrus_admin. "\n";
+if ($cyrus_unix_sep == 1)
+{
+  $sepchar = '/';
+}
+my $prefix = "user".$sepchar;
+
+# Populate the LDAP user list - Very messy but works
+my $ldaprawdata = '';
+my $ldapfieldattr = '';
+my $ldapfielddata = '';
+my $ldaphref = $mesg->as_struct;
+my @ldapuserlist = ();
+foreach (keys %$ldaphref)
+{
+  $ldaprawdata = $$ldaphref{$_};
+  my @ldapsortattr = sort keys %$ldaprawdata;
+  foreach $ldapfieldattr (@ldapsortattr)
+  {
+    next if ( $ldapfieldattr =~ /;binary$/ );
+    my $ldapfielddata = @$ldaprawdata{$ldapfieldattr};
+    if ($debug == 1)
+    {
+      print "$ldapfieldattr = @$ldapfielddata\n";
+    }
+    if ( $ldapfieldattr eq $ldap_user_attr )
+    {
+      $ldapuserlist[$count] = "@$ldapfielddata";
+    }
+  }
+  $count += 1;
+}
+
+my $maildata = '';
+my @mailboxes = $client->list('%', $prefix);
+my @cyrusmboxes = ();
+if ($debug == 1)
+{
+  print "\nThere are ".@ldapuserlist," LDAP users\n";
+  print "\nThere are ".@mailboxes," Cyrus mailboxes\n";
+}
+
+$count = 0;
+
+# Populate the Cyrus mailbox list
+foreach $maildata (@mailboxes)
+{
+  # Note: Element 0 = full mailbox name/path
+  if ($addcyrus == 0 && $report == 0)
+  {
+    print "Cyrus: @{$maildata}[0]\n";
+  }
+  # Remove the Cyrus user part
+  $cyrusmboxes[$count] = substr(@{$maildata}[0],length($prefix),length(@{$maildata}[0]));
+  $count += 1;
+}
+
+my $item = '';
+my %seen = ();
+my @answer = ();
+
+if ($report == 1)
+{
+  $item = '';
+  %seen = ();
+  @answer = ();
+  $count = 0;
+  # Which users are in Cyrus but not in LDAP?
+  @seen{@ldapuserlist} = ();
+  foreach $item (@cyrusmboxes)
+  {
+    push (@answer, $item) unless exists $seen{$item};
+  }
+  foreach $item (@answer)
+  {
+    print "In Cyrus but not LDAP: ". $item ."\n";
+    $count += 1;
+  }
+
+  $item = '';
+  %seen = ();
+  @answer = ();
+  # Which mailboxes are in LDAP, but not in Cyrus?
+  @seen{@cyrusmboxes} = ();
+  foreach $item (@ldapuserlist)
+  {
+    push (@answer, $item) unless exists $seen{$item};
+  }
+  foreach $item (@answer)
+  {
+    print "In LDAP but not Cyrus: ". $item ."\n";
+    $count += 1;
+  }
+  if ($count == 0 && $debug == 1)
+  {
+    print "No differences.\n";
+  }
+}
+else
+{
+  # Iterate over the LDAP user list
+  $count = 0;
+  foreach $realuser (@ldapuserlist) 
+  {
+    if ($addcyrus == 0)
+    {
+      # Display matching ldap record
+      print "LDAP : $realuser\n";
+    }
+    elsif ($addcyrus == 1)
+    {
+      $done = 0;
+      # We check if the Cyrus mailbox exists first, and if not, create it
+      # We ALWAYS check each individual user mailbox too, in case the list
+      # in the var @mailboxes gets updated
+      if ($client->list("$prefix$realuser") && $forcecreate == 0)
+      {
+        if ($debug == 1)
+        {
+          print "Mailbox already exists for $realuser\n";
+        }
+      }
+      elsif ($client->create("$prefix$realuser"))
+      {
+        $done += 1;
+        if ($client->setacl("$prefix$realuser", ${cyrus_admin} => "cd"))
+        {
+          if ($debug == 1)
+          {
+            print "Admin permissions set on $prefix$realuser\n"
+          }
+        }
+        else
+        {
+          print STDERR "Couldn't set $cyrus_admin\'s ACL on mailbox $prefix$realuser\: " . $client->error . "\n";
+          if ($forcecreate == 0)
+          {
+            exit 1;
+          }
+        }
+      }
+      else
+      {
+        print STDERR "Couldn't create mailbox $prefix$realuser\: " . $client->error . "\n";
+        if ($forcecreate == 0)
+        {
+          exit 1;
+        }
+      }
+      foreach my $mailbox ( @mboxlist )
+      {
+        if ($client->list("$prefix$realuser$sepchar$mailbox"))
+        {
+          if ($debug)
+          {
+            print "Mailbox $mailbox already exists for $realuser\n";
+          }
+        }
+        elsif ($client->create("$prefix$realuser$sepchar" . ${mailbox}))
+        {
+          $done += 1;
+        }
+        else
+        {
+          print STDERR  "Couldn't create mailbox $prefix$realuser$sepchar" . ${mailbox}.": " . $client->error . "\n";
+          if ($forcecreate == 0)
+          {
+            exit 1;
+          }
+        }
+      }
+      if ($done > 0)
+      {
+        print "User $realuser\'s mailboxes created successfully\n";
+        $count += 1;
+      }
+    }
+  }
+  if ($count > 0)
+  {
+    print "Created $count user mailboxes\n";
+  }
+}
+
+$mesg = $ldap->unbind;
+exit 0;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileHfCUIw.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c
+--- cyrus-imapd-2.2.13/lib/acl_afs.c	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c	2006-05-03 15:27:47.049193574 +0200
+@@ -114,6 +114,7 @@
+ cyrus_acl_canonproc_t *canonproc;
+ void *canonrock;
+ {
++    const char *canonid;
+     char *newidentifier = 0;
+     char *newacl;
+     char *thisid, *nextid;
+@@ -122,9 +123,14 @@
+ 
+     /* Convert 'identifier' into canonical form */
+     if (*identifier == '-') {
+-	char *canonid = auth_canonifyid(identifier+1, 0);
++	canonid = auth_canonifyid(identifier+1, 0);
+ 	if (!canonid) {
+-	    return -1;
++	    if (access != 0L) {
++		return -1;
++	    } else {
++		/* trying to delete invalid/non-existent identifier */
++		canonid = identifier+1;
++	    }
+ 	}
+ 	newidentifier = xmalloc(strlen(canonid)+2);
+ 	newidentifier[0] = '-';
+@@ -135,9 +141,13 @@
+ 	}
+     }
+     else {
+-	identifier = auth_canonifyid(identifier, 0);
+-	if (!identifier) {
++	canonid = auth_canonifyid(identifier, 0);
++	if (canonid) {
++	    identifier = canonid;
++	} else if (access != 0L) {
+ 	    return -1;
++	} else {
++	    /* trying to delete invalid/non-existent identifier */
+ 	}
+ 	if (canonproc) {
+ 	    access = canonproc(canonrock, identifier, access);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0001-upstream-fix-segfault.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0001-upstream-fix-segfault.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for imap/backend.c, upstream CVS edition 1.40
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-04-22 17:18:39.000000000 +0200
++++ /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c	2006-05-02 22:08:32.024194651 +0200
+@@ -271,7 +271,7 @@
+     /* need to (re)establish connection to server or create one */
+     int sock = -1;
+     int r;
+-    int err = 0;
++    int err = -1;
+     struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res;
+     struct sockaddr_un sunsock;
+     char buf[2048], *mechlist = NULL;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileQDLDMd.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c
+--- cyrus-imapd-2.2.13/imap/fetchnews.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c	2006-05-03 16:07:42.020785607 +0200
+@@ -60,6 +60,7 @@
+ #include "cyrusdb.h"
+ #include "exitcodes.h"
+ #include "global.h"
++#include "gmtoff.h"
+ #include "lock.h"
+ #include "prot.h"
+ #include "xmalloc.h"
+@@ -388,6 +389,7 @@
+ 	       &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec);
+ 	ctime.tm_year -= 1900;
+ 	ctime.tm_mon--;
++	ctime.tm_isdst = -1;
+ 
+ 	/* read the previous timestamp */
+ 	if (!sfile[0]) {
+@@ -417,6 +419,7 @@
+ 	/* ask for new articles */
+ 	if (stamp) stamp -= 180; /* adjust back 3 minutes */
+ 	ptime = gmtime(&stamp);
++	ptime->tm_isdst = -1;
+ 	strftime(buf, sizeof(buf), datefmt, ptime);
+ 	prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf);
+ 	
+@@ -433,7 +436,7 @@
+ 	   We can't change this, otherwise we'd be incompatible
+ 	   with an old localtime timestamp.
+ 	*/
+-	stamp -= timezone;
++	stamp += gmtoff_of(&ctime, stamp);
+     }
+ 
+     if (!newnews) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0003-upstream_disallow_userprobes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
@@ -0,0 +1,205 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filetu535I.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c	2006-05-03 16:02:02.685827405 +0200
+@@ -1785,6 +1785,9 @@
+ 
+ 	sleep(3);
+ 
++	/* Don't allow user probing */
++	if (r == SASL_NOUSER) r = SASL_BADAUTH;
++
+ 	if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
+ 	    prot_printf(imapd_out, "%s NO Login failed: %s\r\n", tag, reply);
+ 	} else {
+@@ -1898,8 +1901,6 @@
+ 	    break;
+ 	default: 
+ 	    /* failed authentication */
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+-
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   imapd_clienthost, authtype, sasl_errdetail(imapd_saslconn));
+ 
+@@ -1908,6 +1909,10 @@
+ 				VARIABLE_LISTEND);
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(imapd_out, "%s NO %s\r\n", tag, errorstring);
+ 	    } else {
+diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c
+--- cyrus-imapd-2.2.13/imap/nntpd.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c	2006-05-03 16:02:02.678828066 +0200
+@@ -2140,13 +2140,16 @@
+ 	    default:
+ 		code = 481;
+ 	    }
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   nntp_clienthost, mech, sasl_errdetail(nntp_saslconn));
+ 
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(nntp_out, "%d %s\r\n", code, errorstring);
+ 	    } else {
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c
+--- cyrus-imapd-2.2.13/imap/pop3d.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c	2006-05-03 16:02:02.679827971 +0200
+@@ -1027,15 +1027,18 @@
+     /* failed authentication */
+     if (sasl_result != SASL_OK)
+     {
++	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
++	       popd_clienthost, popd_apop_chal,
++	       sasl_errdetail(popd_saslconn));
++	
+ 	sleep(3);      
+ 		
++	/* Don't allow user probing */
++	if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++		
+ 	prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
+ 		    sasl_errstring(sasl_result, NULL, NULL));
+ 
+-	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
+-	       popd_clienthost, popd_apop_chal,
+-	       sasl_errdetail(popd_saslconn));
+-	
+ 	return;
+     }
+ 
+@@ -1292,11 +1295,6 @@
+ 	    break;
+ 	default:
+ 	    /* failed authentication */
+-	    sleep(3);
+-		
+-	    prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
+-			sasl_errstring(sasl_result, NULL, NULL));
+-
+ 	    if (authtype) {
+ 		syslog(LOG_NOTICE, "badlogin: %s %s %s",
+ 		       popd_clienthost, authtype,
+@@ -1305,6 +1303,14 @@
+ 		syslog(LOG_NOTICE, "badlogin: %s %s",
+ 		       popd_clienthost, authtype);
+ 	    }
++
++	    sleep(3);
++		
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++		
++	    prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
++			sasl_errstring(sasl_result, NULL, NULL));
+ 	}
+ 	
+ 	reset_saslconn(&popd_saslconn);
+diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13/imap/proxyd.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c	2006-05-03 16:02:02.681827782 +0200
+@@ -2106,7 +2106,7 @@
+     char c;
+     struct buf passwdbuf;
+     char *passwd;
+-    char *reply = 0;
++    const char *reply = 0;
+     int r;
+ 
+     if (proxyd_userid) {
+@@ -2180,17 +2180,19 @@
+ 				 strlen(canon_user),
+ 				 passwd,
+ 				 strlen(passwd)))!=SASL_OK) {
+-	const char *errorstring = sasl_errstring(r, NULL, NULL);
+-	if (reply) {
+-	    syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
+-		   proxyd_clienthost, canon_user, reply);
+-	}
++	syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
++	       proxyd_clienthost, canon_user, sasl_errdetail(proxyd_saslconn));
++
+ 	/* Apply penalty only if not under layer */
+ 	if (proxyd_starttls_done == 0)
+ 	    sleep(3);
+-	if (errorstring) {
++
++	/* Don't allow user probing */
++	if (r == SASL_NOUSER) r = SASL_BADAUTH;
++
++	if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
+ 	    prot_printf(proxyd_out, "%s NO Login failed: %s\r\n", 
+-			tag, errorstring);
++			tag, reply);
+ 	} else {
+ 	    prot_printf(proxyd_out, "%s NO Login failed.", tag);
+ 	}
+@@ -2276,8 +2278,6 @@
+ 	    break;
+ 	default: 
+ 	    /* failed authentication */
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+-
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   proxyd_clienthost, authtype, sasl_errdetail(proxyd_saslconn));
+ 
+@@ -2286,6 +2286,10 @@
+ 				VARIABLE_LISTEND);
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(proxyd_out, "%s NO %s\r\n", tag, errorstring);
+ 	    } else {
+@@ -4253,13 +4257,13 @@
+ 						proxyd_userid, mailboxname);
+     if (!r) r = mlookup(mailboxname, &server, NULL, NULL);
+ 
+-    if(proxyd_userisadmin) {
++    if(!r && proxyd_userisadmin) {
+ 	/* If they are an admin, they won't retain that privledge if we
+ 	 * proxy for them, so we need to refer them -- even if they haven't
+ 	 * told us they're able to handle it. */
+ 	proxyd_refer(tag, server, name);
+-    } else {
+-	if (!r) s = proxyd_findserver(server);
++    } else if (!r) {
++	s = proxyd_findserver(server);
+ 
+ 	if (s) {
+ 	    prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
+@@ -4268,11 +4272,10 @@
+ 	} else {
+ 	    r = IMAP_SERVER_UNAVAILABLE;
+ 	}
++    }
+ 
+-	if (r) {
+-	    prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r));
+-	    return;
+-	}
++    if (r) {
++	prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r));
+     }
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/00list
+++ cyrus-imapd-2.2-2.2.13/debian/patches/00list
@@ -0,0 +1,48 @@
+0001-upstream-fix-segfault.dpatch
+0002-allow_invalid_id_acl_removal.dpatch
+0003-upstream_disallow_userprobes.dpatch
+0004-upstream-fetchnews-timezone-dst-fix.dpatch
+0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
+0006-upstream-free-backend-fix.dpatch
+0007-upstream-remove-undump-size-limit.dpatch
+0008-upstream-better-message-track-logging.dpatch
+0009-upstream-remove-redundant-wildcard-check.dpatch
+0010-upstream-fix-libRSAglue-linkage.dpatch
+0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+0014-upstream-fix-locks-during-reconstruction.dpatch
+0015-upstream-fix-logic-error-in-imapoptions.dpatch
+0016-upstream-fix-typos.dpatch
+0090-fix-casts.dpatch
+01-fix_Makefile.in.dpatch
+02-add_mkinstalldirs.dpatch
+03-fix_docs.dpatch
+04-add_autogen.sh.dpatch
+05-fix_programnames.dpatch
+06-disable_runpath.dpatch
+07-update_aclocal_and_configure.in.dpatch
+08-clean_socket_closes.dpatch
+09-kerberos-ipv4-ipv6-kludge-removal.dpatch
+10-fix_potential_overflows.dpatch
+11-fix_syslog_prefix.dpatch
+12-fix_timeout_handling.dpatch
+13-master_process_handling.dpatch
+14-xmalloc.dpatch
+15-munge_8bit.dpatch
+16-fix_mib.dpatch
+17-fix_tail_syntax_in_xversion.h.dpatch
+18-fix_strlen_return_type.dpatch
+19-fix_tls_ssl.dpatch
+21-fix_config-parsing.dpatch
+22-imapd_index_check.dpatch
+25-update_install-sh.dpatch
+30-update_perlcalling.sh.dpatch
+35-masssievec_remove_unused_variable.dpatch
+40-rehash_fix_pathes.dpatch
+45-kolab2-annotations.dpatch
+61-64bit-quota.dpatch
+65-sieveshell-enhancements.dpatch
+70-allow-larger-buffers.dpatch
+72-faster-isdigit.dpatch
+99-update-autoconf.dpatch
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/03-fix_docs.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/03-fix_docs.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+_# 03-fix_docs.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FAQ and virtual domains installation docs
+
+@DPATCH@
+diff -urNad complete.dpatch/doc/faq.html /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html
+--- complete.dpatch/doc/faq.html	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html	2005-11-10 21:12:05.457868786 +0100
+@@ -111,7 +111,7 @@
+ </pre>
+ 
+ <p>Make sure that <tt>saslauthd</tt> is running and that the cyrus
+-user can access the unix domain socket (defaults to <tt>/var/run/mux</tt>).
++user can access the unix domain socket (defaults to <tt>/var/run/saslauthd/mux</tt>).
+ 
+ </dd>
+ 
+diff -urNad complete.dpatch/doc/install-virtdomains.html /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html
+--- complete.dpatch/doc/install-virtdomains.html	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html	2005-11-10 21:12:05.457868786 +0100
+@@ -99,6 +99,10 @@
+ to the <tt>defaultdomain</tt>.  See <a href=#admins>Administrators</a>
+ below for further discussion.
+ 
++<p><b>Note:</b> Users in the <tt>defaultdomain</tt> must <i>not</i>
++log in using the <tt>user@domain</tt> cross-realm login syntax. The
++<tt>user@domain</tt> type specification only works for them in LMTP.
++
+ <p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
+ options.</p>
+ 
+diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions	2005-11-10 21:13:13.246208162 +0100
+@@ -184,7 +184,11 @@
+    mailbox that does not have a parent mailbox. */
+ 
+ { "defaultdomain", NULL, STRING }
+-/* The default domain for virtual domain support */
++/* The default domain for virtual domain support. Note that this domain
++   is stripped from the email-address transmitted using LMTP, but it
++   is not stripped from usernames at login-time. For imapd/pop3d, 
++   "user" and "user@defaultdomain" specify two different users.
++   Please check install-virtdomains.html for details. */
+ 
+ { "defaultpartition", "default", STRING }
+ /* The partition name used by default for new mailboxes. */
+@@ -436,7 +440,10 @@
+ /* The list of remote realms whose users may authenticate using cross-realm
+    authentication identifiers.  Seperate each realm name by a space.  (A
+    cross-realm identity is considered any identity returned by SASL
+-   with an "@" in it.). */
++   with an "@" in it.) Note that to support multiple virtual domains
++   on the same interface/IP, you need to list them all as loginreals.
++   If you don't list them here, your users probably won't be able to
++   log in. */
+ 
+ { "loginuseacl", 0, SWITCH }
+ /* If enabled, any authentication identity which has \fBa\fR rights on a
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
@@ -0,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileVnqQpc.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html
+--- cyrus-imapd-2.2.13/doc/changes.html	2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html	2006-05-03 17:26:24.115155499 +0200
+@@ -8,6 +8,12 @@
+ </head>
+ <body>
+ 
++<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1> 
++<ul> 
++<li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
++making it useful for remote mailboxes.</li>
++</ul>
++
+ <h1>Changes to the Cyrus IMAP Server since 2.2.12</h1> 
+ <ul> 
+ <li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
+diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c
+--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c	2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c	2006-05-03 17:26:24.129154183 +0200
+@@ -187,7 +187,7 @@
+     switch (d->op) {
+     case DUMP:
+ 	if(!d->partition || !strcmp(d->partition, part)) {
+-	    printf("%s\t%s\t%s\n", name, part, acl);
++	    printf("%s\t%d %s\t%s\n", name, mbtype, part, acl);
+ 	    if(d->purge) {
+ 		config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0);
+ 	    }
+@@ -490,7 +490,7 @@
+     while (fgets(buf, sizeof(buf), stdin)) {
+ 	char *name, *partition, *acl;
+ 	char *p;
+-	int tries = 0;
++	int mbtype = 0, tries = 0;
+ 	
+ 	line++;
+ 
+@@ -501,6 +501,12 @@
+ 	    continue;
+ 	}
+ 	*p++ = '\0';
++	if (isdigit((int) *p)) {
++	    /* new style dump */
++	    mbtype = strtol(p, &p, 10);
++	    /* skip trailing space */
++	    if (*p == ' ') p++;
++	}
+ 	partition = p;
+ 	for (; *p && *p != '\t'; p++) ;
+ 	if (!*p) {
+@@ -523,7 +529,7 @@
+ 	}
+ 
+ 	key = name; keylen = strlen(key);
+-	data = mboxlist_makeentry(0, partition, acl); datalen = strlen(data);
++	data = mboxlist_makeentry(mbtype, partition, acl); datalen = strlen(data);
+ 	
+ 	tries = 0;
+     retry:
+diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8
+--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8	2006-05-03 17:19:51.000000000 +0200
++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8	2006-05-03 17:26:24.125154559 +0200
+@@ -104,7 +104,9 @@
+ .TP
+ .B \-d
+ Dump the contents of the database to standard output in a portable
+-flat-text format.
++flat-text format.  NOTE: In Cyrus versions 2.2.13 and earlier, the dump
++format did not include the mailbox type flags, breaking remote
++mailboxes (frontends, mupdate master) when undumped.
+ .TP
+ .B \-x
+ When performing a dump, remove the mailboxes dumped from the mailbox list
+@@ -115,7 +117,9 @@
+ .TP
+ .B \-u
+ Load the contents of the database from standard input.  The input MUST
+-be in the format output using the \fB\-d\fR option.
++be in the format output using the \fB\-d\fR option.  NOTE: Both the
++old and new formats can be loaded, but the old format will break
++remote mailboxes.
+ .TP
+ .B \-m
+ For backend servers in the Cyrus Murder, synchronize the local mailbox list
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0006-upstream-free-backend-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0006-upstream-free-backend-fix.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix: only free() the backend struct if we allocated it
+## DP: (don't free cached connections)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:01:09.000000000 +0200
++++ /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:14:12.909137753 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: backend.c,v 1.39 2006/02/07 20:57:27 murch Exp $ */
++/* $Id: backend.c,v 1.41 2006/05/11 18:05:29 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -264,7 +264,7 @@
+     }
+ }
+ 
+-struct backend *backend_connect(struct backend *ret, const char *server,
++struct backend *backend_connect(struct backend *ret_backend, const char *server,
+ 				struct protocol_t *prot, const char *userid,
+ 				const char **auth_status)
+ {
+@@ -276,13 +276,16 @@
+     struct sockaddr_un sunsock;
+     char buf[2048], *mechlist = NULL;
+     struct sigaction action;
++    struct backend *ret;
+ 
+-    if (!ret) {
++    if (!ret_backend) {
+ 	ret = xmalloc(sizeof(struct backend));
+ 	memset(ret, 0, sizeof(struct backend));
+ 	strlcpy(ret->hostname, server, sizeof(ret->hostname));
+ 	ret->timeout = NULL;
+     }
++    else
++	ret = ret_backend;
+ 
+     if (server[0] == '/') { /* unix socket */
+ 	res0 = &hints;
+@@ -312,7 +315,7 @@
+ 	if (err) {
+ 	    syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
+ 		   server, gai_strerror(err));
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    return NULL;
+ 	}
+         /* Get addrinfo struct for local interface. */
+@@ -363,7 +366,7 @@
+ 	if (res0 != &hints)
+ 	    freeaddrinfo(res0);
+ 	syslog(LOG_ERR, "connect(%s) failed: %m", server);
+-	free(ret);
++	if (!ret_backend) free(ret);
+ 	return NULL;
+     }
+     memcpy(&ret->addr, res->ai_addr, res->ai_addrlen);
+@@ -381,7 +384,7 @@
+ 	    syslog(LOG_ERR,
+ 		   "backend_connect(): couldn't read initial greeting: %s",
+ 		   ret->in->error ? ret->in->error : "(null)");
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    close(sock);
+ 	    return NULL;
+ 	}
+@@ -396,14 +399,16 @@
+ 	if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) {
+ 	    syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
+ 		   sasl_errstring(r, NULL, NULL));
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    close(sock);
+ 	    ret = NULL;
+ 	}
+     }
+ 
+     if (mechlist) free(mechlist);
+-    
++
++    if (!ret_backend) ret_backend = ret;
++	    
+     return ret;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
@@ -0,0 +1,128 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0007-upstream-remove-undump-size-limit by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove limit on the size of mailbox files that can be received by UNDUMP
+## DP: (write file directly to disk rather than reading the literal into memory)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c /tmp/dpep.ttpH40/cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13/imap/mbdump.c	2006-05-12 12:15:44.000000000 +0200
++++ /tmp/dpep.ttpH40/cyrus-imapd-2.2.13/imap/mbdump.c	2006-05-12 12:17:32.871354378 +0200
+@@ -1,5 +1,5 @@
+ /* mbdump.c -- Mailbox dump routines
+- * $Id: mbdump.c,v 1.30 2004/05/22 03:45:51 rjs3 Exp $
++ * $Id: mbdump.c,v 1.31 2006/05/11 17:43:18 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -585,6 +585,10 @@
+     while(1) {
+ 	char fnamebuf[MAX_MAILBOX_PATH + 1024];
+ 	char *seen_file = NULL;
++	int isnowait, sawdigit;
++	unsigned long size;
++	unsigned long cutoff = ULONG_MAX / 10;
++	unsigned digit, cutlim = ULONG_MAX % 10;
+ 	
+       	c = getastring(pin, pout, &file);
+ 	if(c != ' ') {
+@@ -676,13 +680,43 @@
+ 
+ 	    continue;
+ 	}
+-	    
+-	c = getbastring(pin, pout, &data);
+-	if(c != ' ' && c != ')') {
++
++	/* read size of literal */
++	c = prot_getc(pin);
++	if (c != '{') {
+ 	    r = IMAP_PROTOCOL_ERROR;
+ 	    goto done;
+ 	}
+ 
++	size = isnowait = sawdigit = 0;
++	while ((c = prot_getc(pin)) != EOF && isdigit(c)) {
++	    sawdigit = 1;
++	    digit = c - '0';
++	    /* check for overflow */
++	    if (size > cutoff || (size == cutoff && digit > cutlim)) {
++                fatal("literal too big", EC_IOERR);
++            }
++	    size = size*10 + digit;
++	}
++	if (c == '+') {
++	    isnowait++;
++	    c = prot_getc(pin);
++	}
++	if (c == '}') {
++	    c = prot_getc(pin);
++	    if (c == '\r') c = prot_getc(pin);
++	}
++	if (!sawdigit || c != '\n') {
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
++
++	if (!isnowait) {
++	    /* Tell client to send the message */
++	    prot_printf(pout, "+ go ahead\r\n");
++	    prot_flush(pout);
++	}
++
+ 	if(userid && !strcmp(file.s, "SUBS")) {
+ 	    /* overwriting this outright is absolutely what we want to do */
+ 	    char *s = mboxlist_hash_usersubs(userid);
+@@ -742,7 +776,7 @@
+ 	    if(strncmp(file.s, "cyrus.", 6)) {
+ 		/* it doesn't match cyrus.*, so its a message file.
+ 		 * charge it against the quota */
+-		quotaused += data.len;
++		quotaused += size;
+ 	    }
+ 	}	
+ 
+@@ -760,10 +794,24 @@
+ 	    goto done;
+ 	}
+ 
+-	if(write(curfile,data.s,data.len) == -1) {
+-	    syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
+-	    r = IMAP_IOERROR;
+-	    goto done;
++	/* write data to file */
++	while (size) {
++	    char buf[4096+1];
++	    int n = prot_read(pin, buf, size > 4096 ? 4096 : size);
++	    if (!n) {
++		syslog(LOG_ERR,
++		       "IOERROR: reading message: unexpected end of file");
++		r = IMAP_IOERROR;
++		goto done;
++	    }
++
++	    size -= n;
++
++	    if (write(curfile, buf, n) != n) {
++		syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
++		r = IMAP_IOERROR;
++		goto done;
++	    }
+ 	}
+ 
+ 	close(curfile);
+@@ -777,7 +825,12 @@
+ 	    unlink(fnamebuf);
+ 	}
+ 	
+-	if(c == ')') break;
++	c = prot_getc(pin);
++	if (c == ')') break;
++	if (c != ' ') {
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
+     }
+     
+     if(!r && quotaused) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0008-upstream-better-message-track-logging.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0008-upstream-better-message-track-logging by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: better logging to facilitate message tracking (Wes Craig <wes@umich.edu>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c
+--- cyrus-imapd-2.2.13/imap/lmtp_sieve.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c	2006-05-12 12:17:52.579503152 +0200
+@@ -1,6 +1,6 @@
+ /* lmtp_sieve.c -- Sieve implementation for lmtpd
+  *
+- * $Id: lmtp_sieve.c,v 1.11 2005/11/21 16:26:16 murch Exp $
++ * $Id: lmtp_sieve.c,v 1.12 2006/05/10 16:27:17 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -327,6 +327,8 @@
+ 				    sievedb, strlen(sievedb), time(NULL), 0);
+ 
+ 	snmp_increment(SIEVE_REDIRECT, 1);
++	syslog(LOG_INFO, "sieve redirected: %s to: %s",
++	       m->id ? m->id : "<nomsgid>", rc->addr);
+ 	return SIEVE_OK;
+     } else {
+ 	if (res == -1) {
+@@ -349,17 +351,8 @@
+     snmp_increment(SIEVE_DISCARD, 1);
+ 
+     /* ok, we won't file it, but log it */
+-    if (md->id && strlen(md->id) < 80) {
+-	char pretty[160];
+-
+-	beautify_copy(pretty, md->id);
+-	syslog(LOG_INFO, "sieve: discarded message to %s id %s",
+-	       sd->username, pretty);
+-    }
+-    else {
+-	syslog(LOG_INFO, "sieve: discarded message to %s",
+-	       sd->username);
+-    }	
++    syslog(LOG_INFO, "sieve discarded: %s",
++	   md->id ? md->id : "<nomsgid>");
+ 
+     return SIEVE_OK;
+ }
+@@ -383,7 +376,7 @@
+ 
+     if (strlen(md->return_path) == 0) {
+ 	syslog(LOG_INFO, "sieve: discarded reject to <> for %s id %s",
+-	       sd->username, md->id);
++	       sd->username, md->id ? md->id : "<nomsgid>");
+         return SIEVE_OK;
+     }
+ 
+@@ -393,6 +386,8 @@
+ 			      origreceip, sd->username,
+ 			      rc->msg, md->data)) == 0) {
+ 	snmp_increment(SIEVE_REJECT, 1);
++	syslog(LOG_INFO, "sieve rejected: %s to: %s",
++	       md->id ? md->id : "<nomsgid>", md->return_path);
+ 	return SIEVE_OK;
+     } else {
+ 	if (res == -1) {
+diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c
+--- cyrus-imapd-2.2.13/imap/lmtpd.c	2006-05-06 10:34:48.000000000 +0200
++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c	2006-05-12 12:17:52.578503246 +0200
+@@ -1,6 +1,6 @@
+ /* lmtpd.c -- Program to deliver mail to a mailbox
+  *
+- * $Id: lmtpd.c,v 1.143 2006/01/20 20:29:33 jeaton Exp $
++ * $Id: lmtpd.c,v 1.144 2006/05/10 16:27:17 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -321,6 +321,7 @@
+ 			       strlen(mailboxname), now, uid);
+ 
+ 	    append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid, NULL);
++	    syslog(LOG_INFO, "Delivered: %s to mailbox: %s", id, mailboxname);
+ 	}
+     }
+ 
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2006-05-06 10:34:48.000000000 +0200
++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c	2006-05-12 12:17:52.581502964 +0200
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
++ * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -1931,6 +1931,11 @@
+ 	}
+     }
+ 
++    if (numdeleted > 0) {
++	syslog(LOG_NOTICE, "Expunged %d messages from %s",
++	       numdeleted, mailbox->name); 
++    }
++
+     free(buf);
+     if (deleted) free(deleted);
+ 
+@@ -2187,6 +2192,7 @@
+ 	*tail = '\0';
+     } while (rmdir(buf) == 0 && (tail = strrchr(buf, '/')));
+ 
++    syslog(LOG_NOTICE, "Deleted mailbox %s", mailbox->name); 
+     mailbox_close(mailbox);
+     return 0;
+ }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0009-upstream-remove-redundant-wildcard-check by Sven Mueller
+##                                            <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove redundant check for wildcards in mailbox names
+## DP: (Wes Craig <wes@umich.edu>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-05-12 12:18:02.000000000 +0200
++++ /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/imapd.c	2006-05-12 12:18:43.442725508 +0200
+@@ -38,7 +38,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: imapd.c,v 1.498 2006/01/13 22:06:28 murch Exp $ */
++/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -3952,11 +3952,6 @@
+ 	}
+     }
+ 
+-    /* verify that the mailbox doesn't have a wildcard in it */
+-    for (p = oldmailboxname; !r && *p; p++) {
+-	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
+-    }
+-
+     /* attempt to rename the base mailbox */
+     if (!r) {
+ 	r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/mboxlist.c
+--- cyrus-imapd-2.2.13/imap/mboxlist.c	2006-05-06 10:34:48.000000000 +0200
++++ /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/mboxlist.c	2006-05-12 12:18:12.192660857 +0200
+@@ -40,7 +40,7 @@
+  *
+  */
+ /*
+- * $Id: mboxlist.c,v 1.241 2005/11/22 18:20:51 murch Exp $
++ * $Id: mboxlist.c,v 1.242 2006/05/10 15:41:52 murch Exp $
+  */
+ 
+ #include <config.h>
+@@ -476,10 +476,6 @@
+ 		free(acl);
+ 		return IMAP_PERMISSION_DENIED;
+ 	    }
+-	    /* disallow wildcards in userids with inboxes. */	     
+-	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
+-		return IMAP_MAILBOX_BADNAME;
+-	    }
+ 
+ 	    /*
+ 	     * Users by default have all access to their personal mailbox(es),
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010-upstream-fix-libRSAglue-linkage by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: check if we need libRSAglue before linking it
+## DP: Upstream committer: murch
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4
+--- cyrus-imapd-2.2.13/cmulocal/openssl.m4	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4	2006-05-17 21:06:43.162414202 +0200
+@@ -1,6 +1,6 @@
+ dnl
+ dnl macros for configure.in to detect openssl
+-dnl $Id: openssl.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $
++dnl $Id: openssl.m4,v 1.11 2006/05/17 18:30:19 murch Exp $
+ dnl
+ 
+ AC_DEFUN([CMU_HAVE_OPENSSL], [
+@@ -24,8 +24,11 @@
+ 	  dnl we need to include the rsaref libraries in the crypto check
+                 LIB_RSAREF=""
+ 	        AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
+-		       LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
+-		       cmu_have_rsaref=no)
++			cmu_have_rsaref=yes;
++			[AC_CHECK_LIB(RSAglue, RSAPublicEncrypt,
++				LIB_RSAREF="-lRSAglue -lrsaref",
++				LIB_RSAREF="-lrsaref")],
++			cmu_have_rsaref=no)
+ 
+ 		AC_CHECK_HEADER(openssl/evp.h, [
+ 			AC_CHECK_LIB(crypto, EVP_DigestInit,
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0011-upstream-allow-compile-with-krb5-1.4.3 by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch to compile with MIT krb5 1.4.3 (Philip Guenther <guenther@sendmail.com>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 /tmp/dpep.YFbKHG/cyrus-imapd-2.2.13/cmulocal/sasl2.m4
+--- cyrus-imapd-2.2.13/cmulocal/sasl2.m4	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.YFbKHG/cyrus-imapd-2.2.13/cmulocal/sasl2.m4	2006-05-19 15:18:35.458325180 +0200
+@@ -1,6 +1,6 @@
+ # sasl2.m4--sasl2 libraries and includes
+ # Rob Siemborski
+-# $Id: sasl2.m4,v 1.51 2005/05/07 04:15:17 shadow Exp $
++# $Id: sasl2.m4,v 1.52 2006/05/18 19:25:00 murch Exp $
+ 
+ # SASL2_CRYPT_CHK
+ # ---------------
+@@ -110,9 +110,12 @@
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
++    # check for libkrb5support first
++    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
++
+     gss_failed=0
+     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
+-                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
++                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
+     if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+       gss_impl="failed"
+     fi
+@@ -164,8 +167,8 @@
+   fi
+ 
+   if test "$gss_impl" = "mit"; then
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+-    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream compatibility fix for SASL 2.1.22
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c	2006-05-05 21:04:25.000000000 -0400
++++ cyrus-imapd-2.2.13/imtest/imtest.c	2006-05-25 17:49:37.000000000 -0400
+@@ -1,7 +1,7 @@
+ /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
+  * Ken Murchison (multi-protocol implementation)
+  * Tim Martin (SASL implementation)
+- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $
++ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
+  *
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+@@ -886,6 +886,12 @@
+     }
+     
+     if (*str != '\r') {
++	/* trim CRLF */
++	char *p = str + strlen(str) - 1;
++	if (p >= str && *p == '\n') *p-- = '\0';
++	if (p >= str && *p == '\r') *p-- = '\0';
++
++	/* alloc space for decoded response */
+ 	len = strlen(str) + 1;
+ 	*line = malloc(len);
+ 	if ((*line) == NULL) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-allow-report-above-4GB-mboxsize by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch to allow reporting of mailbox sizes above 4GB
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c
+--- ./imap/annotate.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c	2006-06-08 13:46:52.018338460 +0200
+@@ -703,7 +703,13 @@
+     struct mailbox mailbox;
+     struct index_record record;
+     int r = 0, msg;
++#ifdef HAVE_LONG_LONG_INT
++    unsigned long long totsize = 0;
++# define SIZE_FMT "%llu"
++#else 
+     unsigned long totsize = 0;
++# define SIZE_FMT "%lu"
++#endif
+     char value[21];
+     struct annotation_data attrib;
+ 
+@@ -735,7 +741,7 @@
+ 
+     mailbox_close(&mailbox);
+ 
+-    if (r || snprintf(value, sizeof(value), "%lu", totsize) == -1)
++    if (r || snprintf(value, sizeof(value), SIZE_FMT, totsize) == -1)
+ 	return;
+ 
+     memset(&attrib, 0, sizeof(attrib));
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0014-upstream-fix-locks-during-reconstruction.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: don't lock/unlock_pop when reconstructing
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 12:59:59.000000000 +0200
++++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 13:00:01.083767966 +0200
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
++ * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -1391,11 +1391,14 @@
+ 	return r;
+     }
+ 
+-    r = mailbox_lock_pop(mailbox);
+-    if (r) {
+-	mailbox_unlock_index(mailbox);
+-	mailbox_unlock_header(mailbox);
+-	return r;
++    if (!mailbox_doing_reconstruct) {
++	/* If we're reconstructing, we don't open the existing cache file */
++	r = mailbox_lock_pop(mailbox);
++	if (r) {
++	    mailbox_unlock_index(mailbox);
++	    mailbox_unlock_header(mailbox);
++	    return r;
++	}
+     }
+ 
+     strlcpy(fnamebuf, mailbox->path, sizeof(fnamebuf));
+@@ -1499,7 +1502,7 @@
+ 	goto fail;
+     }
+ 
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+     fclose(newindex);
+@@ -1507,7 +1510,7 @@
+     return 0;
+ 
+  fail:
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileDNZ3cU.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions	2006-06-06 17:51:14.392340472 +0200
+@@ -42,7 +42,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+-.\" $Id: imapoptions,v 1.36 2006/03/30 15:49:58 murch Exp $
++.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $
+ .SH NAME
+ imapd.conf \- IMAP configuration file
+ .SH DESCRIPTION
+@@ -801,7 +801,7 @@
+ /* The cyrusdb backend to use for the subscriptions list. */
+ 
+ { "syslog_prefix", NULL, STRING }
+-/* String to be appended to the process name in syslog entries. */
++/* String to be prepended to the process name in syslog entries. */
+ 
+ { "temp_path", "/tmp", STRING }
+ /* The pathname to store temporary files in */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0016-upstream-fix-typos.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## upstream-fix-typos by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: See https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/reconstruct.8.diff?r1=1.19&r2=1.20
+## DP: And https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/chk_cyrus.8.diff?r1=1.3&r2=1.4
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8
+--- cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-06-19 16:11:13.870518758 +0200
+@@ -40,7 +40,7 @@
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+ .SH NAME
+-chk_cyrus \- perform a consistancy check of the cyrus mailstore
++chk_cyrus \- perform a consistency check of the cyrus mailstore
+ .SH SYNOPSIS
+ .B chk_cyrus
+ [
+@@ -57,7 +57,7 @@
+ ]
+ .SH DESCRIPTION
+ .I Chk_cyrus
+-is used to perform a consistancy check on the cyrus datastore, and output
++is used to perform a consistency check on the cyrus datastore, and output
+ a list of files/directories that are expected to exist, but do not.
+ Status messagess are output to stderr, the list of files/directories is
+ output to stdout.  This list can be passed to a backup program to aid a
+@@ -73,10 +73,10 @@
+ Read configuration options from \fIconfig-file\fR.
+ .TP
+ .BI \-P " partition"
+-Run the consistancy check for only the given partition.
++Run the consistency check for only the given partition.
+ May not be specified with -M.
+ .BI \-M " mailbox"
+-Run the consistancy check for only the given mailbox.
++Run the consistency check for only the given mailbox.
+ May not be specified with -P.
+ .SH FILES
+ .TP
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8
+--- cyrus-imapd-2.2.13/man/reconstruct.8	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8	2006-06-19 16:10:34.583199793 +0200
+@@ -119,7 +119,7 @@
+ When processing a mailbox which is not in the mailbox list (e.g. via
+ the -p or -f options), do not import the metadata from the mailbox,
+ instead create it anew (this specifically affects atleast the mailbox's seen
+-stat unique identifier, user flags, and ACL).
++state unique identifier, user flags, and ACL).
+ .TP
+ .B \-r
+ Recursively reconstruct all sub-mailboxes of the mailboxes or mailbox
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0090-fix-casts.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0090-fix-casts.dpatch
@@ -0,0 +1,123 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0090-fix-casts.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compile-time warnings about casts from pointer to integer 
+## DP: of different size.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c
+--- ./imap/squat_build.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c	2006-06-08 14:33:06.966146056 +0200
+@@ -479,7 +479,7 @@
+     for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
+       SquatWordTableEntry* e = &(t->entries[i]);
+       
+-      if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) {
++      if (e->leaf_presence != NULL && ((int)e->leaf_presence_singleton & 1) == 0) {
+         free(e->leaf_presence);
+       }
+     }
+@@ -568,7 +568,7 @@
+ 
+   if (word_entry == NULL) {
+     /* We are in "per document" mode. */
+-    if (((int)e->leaf_presence & 1) != 0) {
++    if (((int)e->leaf_presence_singleton & 1) != 0) {
+       /* We currently have a singleton here. */
+       int oldch = e->leaf_presence_singleton >> 1;
+ 
+@@ -787,7 +787,7 @@
+ 
+       word[0] = (char)i;
+ 
+-      if (((int)e->leaf_presence & 1) != 0) {
++      if (((int)e->leaf_presence_singleton & 1) != 0) {
+ 	/* Got a singleton at this branch point. Just output the single word. */
+         word[1] = (char)(e->leaf_presence_singleton >> 1);
+         e->leaf_presence = NULL; /* clear the leaf out */
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c
+--- ./imap/tls.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c	2006-06-08 14:28:13.259629963 +0200
+@@ -717,14 +717,22 @@
+ 	return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int) argp,
++#if __WORDSIZE == 64
++	printf("read from %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("read from %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+ 	return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int)argp,
++#if __WORDSIZE == 64
++	printf("write to %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("write to %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t)argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+     }
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c
+--- ./master/master.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c	2006-06-08 14:28:13.259629963 +0200
+@@ -1304,7 +1304,6 @@
+ 
+ void add_service(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int prefork = masterconf_getint(e, "prefork", 0);
+     int babysit = masterconf_getswitch(e, "babysit", 0);
+@@ -1324,7 +1323,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for service '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1340,7 +1339,7 @@
+ 	/* must have empty/same service name, listen and proto */
+ 	if ((!Services[i].name || !strcmp(Services[i].name, name)) &&
+ 	    (!Services[i].listen || !strcmp(Services[i].listen, listen)) &&
+-	    (!Services[i].proto || !strcmp(Services[i].proto, proto)))
++	    ((Services[i].proto==NULL) || !strcmp(Services[i].proto, proto)))
+ 	    break;
+     }
+ 
+@@ -1349,7 +1348,7 @@
+ 	char buf[256];
+ 	snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1438,7 +1437,6 @@
+ 
+ void add_event(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int period = 60 * masterconf_getint(e, "period", 0);
+     int at = masterconf_getint(e, "at", -1), hour, min;
+@@ -1450,7 +1448,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for event '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/08-clean_socket_closes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/08-clean_socket_closes.dpatch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-clean_socket_closes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cleanly close sockets
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:20:40.000000000 +0200
++++ /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:22:01.565116257 +0200
+@@ -400,6 +400,7 @@
+ 	    syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
+ 		   sasl_errstring(r, NULL, NULL));
+ 	    if (!ret_backend) free(ret);
++ 	    shutdown(sock, SHUT_RDWR);
+ 	    close(sock);
+ 	    ret = NULL;
+ 	}
+diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c	2005-11-11 00:01:58.076164940 +0100
+@@ -158,6 +158,15 @@
+     mboxlist_done();
+     closelog();
+     cyrus_done();
++
++    /* be nice to remote */
++    shutdown(0, SHUT_RD);
++    shutdown(1, SHUT_RD);
++    shutdown(2, SHUT_RD);
++    close(0);
++    close(1);
++    close(2);
++
+     exit(code);
+ }
+ 
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c	2005-11-11 00:04:47.146591300 +0100
+@@ -767,6 +767,10 @@
+ #ifdef HAVE_SSL
+     tls_shutdown_serverengine();
+ #endif
++    /* shutdown socket nicely */
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     cyrus_done();
+ 
+diff -urNad complete.dpatch/imap/lmtpd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c
+--- complete.dpatch/imap/lmtpd.c	2004-12-17 17:32:15.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c	2005-11-11 00:02:48.172254190 +0100
+@@ -553,6 +553,9 @@
+ 
+     cyrus_done();
+ 
++    /* shutdown socket nicely */
++    cyrus_reset_stdio();
++
+     exit(code);
+ }
+ 
+diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c	2005-11-10 21:07:23.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c	2005-11-11 00:03:22.702869236 +0100
+@@ -496,6 +496,9 @@
+ #endif
+ 
+     cyrus_done();
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     exit(code);
+ }
+diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c	2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c	2005-11-11 00:04:04.761746266 +0100
+@@ -1382,6 +1382,9 @@
+ #endif
+ 
+     cyrus_done();
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     exit(code);
+ }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/01-fix_Makefile.in.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/01-fix_Makefile.in.dpatch
@@ -0,0 +1,162 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_Makefile.in.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix all Makefile.in files as necessary
+
+@DPATCH@
+diff -urNad complete.dpatch/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/Makefile.in
+--- complete.dpatch/Makefile.in	2005-02-14 17:43:44.000000000 +0100
++++ /tmp/dpep.hthEz2/complete.dpatch/Makefile.in	2005-11-10 16:34:20.133821819 +0100
+@@ -41,7 +41,7 @@
+ # 
+ 
+ SUBDIRS = man @PRE_SUBDIRS@ lib @SIEVE_SUBDIRS@ @SERVER_SUBDIRS@ \
+-	imtest @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
++	imtest perl @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
+ DISTSUBDIRS = doc
+ 
+ srcdir = @srcdir@
+diff -urNad complete.dpatch/imap/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in
+--- complete.dpatch/imap/Makefile.in	2004-05-28 20:03:02.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in	2005-11-10 16:34:20.133821819 +0100
+@@ -72,7 +72,7 @@
+ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/installsieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in
+--- complete.dpatch/installsieve/Makefile.in	2003-10-22 20:50:11.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -48,7 +48,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ INSTALL = @INSTALL@
+diff -urNad complete.dpatch/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in
+--- complete.dpatch/lib/Makefile.in	2004-05-28 20:03:04.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -62,7 +62,7 @@
+ LIBS = @LIBS@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ @WARNERROR@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in
+--- complete.dpatch/master/Makefile.in	2004-12-17 17:32:24.000000000 +0100
++++ /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -57,7 +57,7 @@
+ CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = @DEPLIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
+ LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
+ 
+diff -urNad complete.dpatch/notifyd/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in
+--- complete.dpatch/notifyd/Makefile.in	2004-05-28 20:03:06.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -54,7 +54,7 @@
+ 
+ DEFS = @DEFS@ @LOCALDEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ prefix = @prefix@
+diff -urNad complete.dpatch/perl/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in
+--- complete.dpatch/perl/Makefile.in	2003-10-22 20:50:17.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -82,9 +82,9 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 			fi; \
+-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
++			$(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+ 
+ install::
+diff -urNad complete.dpatch/perl/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in
+--- complete.dpatch/perl/sieve/Makefile.in	2003-10-22 20:50:24.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -84,9 +84,9 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 			fi; \
+-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
++			$(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+ 
+ install::
+diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in
+--- complete.dpatch/perl/sieve/lib/Makefile.in	2004-05-28 20:03:07.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -57,7 +57,7 @@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in
+--- complete.dpatch/sieve/Makefile.in	2004-05-28 20:03:09.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -40,7 +40,7 @@
+ DEFS = @DEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -51,6 +51,7 @@
+ LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ 
++BINARIES = sievec sieved
+ BUILT_SOURCES = addr.c addr.h addr-lex.c \
+ 	sieve.c sieve.h sieve-lex.c \
+ 	sieve_err.h sieve_err.c
+@@ -114,7 +115,7 @@
+ 	$(COMPILE_ET) $(srcdir)/sieve_err.et
+ 
+ clean:
+-	rm -f test *~ *.o *.a Makefile.bak makedepend.log
++	rm -f test *~ *.o *.a Makefile.bak makedepend.log $(BINARIES)
+ 
+ distclean: clean
+ 	rm -f Makefile
+diff -urNad complete.dpatch/timsieved/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in
+--- complete.dpatch/timsieved/Makefile.in	2004-05-28 20:03:10.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -54,7 +54,7 @@
+ 
+ DEFS = @DEFS@ @LOCALDEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ prefix = @prefix@
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/02-add_mkinstalldirs.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch
@@ -0,0 +1,161 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-add_mkinstalldirs.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add mkinstalldirs
+
+@DPATCH@
+diff -urNad complete.dpatch/mkinstalldirs /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs
+--- complete.dpatch/mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs	2005-11-10 16:36:11.547841465 +0100
+@@ -0,0 +1,150 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++
++scriptversion=2005-02-02.21
++
++# 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
++  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
++
++for file
++do
++  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++  shift
++
++  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
++      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
++done
++
++exit $errstatus
++
++# 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:
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/04-add_autogen.sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/04-add_autogen.sh.dpatch
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-add_autogen.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autogen.sh
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh
+--- cyrus-imapd-2.2.12/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh	2005-11-11 19:47:43.571058024 +0100
+@@ -0,0 +1,77 @@
++#!/bin/sh
++#
++# autogen.sh glue for CMU Cyrus IMAP
++# $Id: autogen.sh,v 1.16 2004/09/12 15:30:23 hmh Exp $
++#
++# Requires: automake 1.9, autoconf 2.57, dpkg-dev
++set -e
++
++# Refresh GNU autotools toolchain.
++echo Running GNU autotools toolchain...
++AUTOMAKEDIR=/usr/share/automake-1.9
++[ -n "$AUTOMAKEDIR" ] &&
++  for i in config.guess config.sub install-sh mkinstalldirs ; do
++	test -r ${AUTOMAKEDIR}/${i} && {
++		rm -f ${i} || true
++		cp ${AUTOMAKEDIR}/${i} .
++	}
++	chmod 755 ${i}
++  done
++
++aclocal-1.9 -I cmulocal
++autoheader
++#automake --verbose --foreign --add-missing
++autoconf
++
++# For the Debian build
++test -d debian && {
++	# Kill executable list first
++	#rm -f debian/executable.files
++
++	# Make sure our executable and removable lists won't be screwed up
++	#debclean && echo Cleaned buildtree just in case...
++
++	# refresh list of executable scripts, to avoid possible breakage if
++	# upstream tarball does not include the file or if it is mispackaged
++	# for whatever reason.
++	#echo Generating list of executable files...
++	#rm -f debian/executable.files
++	#find -type f -perm +111 ! -name '.*' -print  | sort > debian/executable.files
++
++	# even in Debian builds, copy them in, don't link them
++	rm -f config.sub config.guess
++	cp /usr/share/misc/config.sub .
++	cp /usr/share/misc/config.guess .
++
++	# Remove any files in upstream tarball that we don't have in the Debian
++	# package (because diff cannot remove files)
++	# THIS CRAP IS NOT EMBEDDED SPACE-SAFE!
++	version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
++	source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
++	#if test -r ../${source}_${version}.orig.tar.gz ; then
++	#	echo Generating list of files that should be removed...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files.new
++	#	mkdir debian/tmp
++	#	cd debian/tmp
++	#	tar -zxf ../../../${source}_${version}.orig.tar.gz
++	#	# et/ we handle directly
++	#	rm -fr */et/
++	#	cd ../..
++	#	for i in `find debian/tmp/ -type f ! -name '.*' -print | xargs` ; do
++	#	  if test -r ${i} ; then
++	#	     filename=`echo "${i}" | sed -e 's#.*debian/tmp/[^/]+/##'`
++	#	     test -r "${filename}" || echo "${filename}" >>debian/deletable.files.new
++	#	  fi
++	#	done
++	#	sort < debian/deletable.files.new > debian/deletable.files \
++	#		&& rm debian/deletable.files.new
++	#	rm -fr debian/tmp
++	#else
++	#	echo Emptying list of files that should be deleted...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files
++	#fi
++}
++
++exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/05-fix_programnames.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/05-fix_programnames.dpatch
@@ -0,0 +1,579 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-fix_programnames_in_manpages.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix some minor things in manpages, fix program names in manpages and
+## DP: program sources
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c
+--- complete.dpatch/imap/deliver.c	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c	2005-11-11 15:34:00.393958651 +0100
+@@ -99,7 +99,7 @@
+ static void usage()
+ {
+     fprintf(stderr, 
+-	    "421-4.3.0 usage: deliver [-C <alt_config> ] [-m mailbox]"
++	    "421-4.3.0 usage: cyrdeliver [-C <alt_config> ] [-m mailbox]"
+ 	    " [-a auth] [-r return_path] [-l] [-D]\r\n");
+     fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION);
+     exit(EC_USAGE);
+diff -urNad complete.dpatch/imap/quota.c /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c
+--- complete.dpatch/imap/quota.c	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c	2005-11-11 15:34:00.393958651 +0100
+@@ -208,7 +208,7 @@
+ void usage(void)
+ {
+     fprintf(stderr,
+-	    "usage: quota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
++	    "usage: cyrquota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
+     exit(EC_USAGE);
+ }    
+ 
+diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c
+--- complete.dpatch/imap/reconstruct.c	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c	2005-11-11 15:34:00.394958554 +0100
+@@ -345,8 +345,8 @@
+ void usage(void)
+ {
+     fprintf(stderr,
+-	    "usage: reconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+-    fprintf(stderr, "       reconstruct [-C <alt_config>] -m\n");
++	    "usage: cyrreconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
++    fprintf(stderr, "       cyrreconstruct [-C <alt_config>] -m\n");
+     exit(EC_USAGE);
+ }    
+ 
+diff -urNad complete.dpatch/man/chk_cyrus.8 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8
+--- complete.dpatch/man/chk_cyrus.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8	2005-11-11 15:34:00.394958554 +0100
+@@ -83,4 +83,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_cyrusdb.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8
+--- complete.dpatch/man/ctl_cyrusdb.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8	2005-11-11 15:34:00.394958554 +0100
+@@ -94,4 +94,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8
+--- complete.dpatch/man/ctl_deliver.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8	2005-11-11 15:34:00.395958456 +0100
+@@ -78,4 +78,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_mboxlist.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8
+--- complete.dpatch/man/ctl_mboxlist.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8	2005-11-11 15:34:00.395958456 +0100
+@@ -138,4 +138,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/cyr_expire.8 /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8
+--- complete.dpatch/man/cyr_expire.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8	2005-11-11 15:34:00.395958456 +0100
+@@ -90,4 +90,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/cyrus.conf.5 /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5
+--- complete.dpatch/man/cyrus.conf.5	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5	2005-11-11 15:34:00.396958358 +0100
+@@ -44,9 +44,9 @@
+ cyrus.conf \- Cyrus configuration file
+ .SH DESCRIPTION
+ \fB/etc/cyrus.conf\fR 
+-is the configuration file for the Cyrus \fBmaster\fR process.  It
++is the configuration file for the Cyrus \fBcyrmaster\fR process.  It
+ defines the startup procedures, services and events to be spawned by
+-\fBmaster\fR.
++\fBcyrmaster\fR.
+ .PP
+ The \fB/etc/cyrus.conf\fR file consists of a series of entries divided
+ into sections of the form
+@@ -105,7 +105,7 @@
+ \fR[ \fIhost\fR \fB: \fR] \fIport\fR
+ .br
+ .sp
+-where \fIpath\fR is the explicit path to a UNIX socket, \fIhost\fR is
++where \fIpath\fR is the explicit (absolute) path to a UNIX socket, \fIhost\fR is
+ either the hostname or bracket-enclosed IP address of a network
+ interface, and \fIport\fR is either a port number or service name (as listed
+ in \fB/etc/services\fR).
+@@ -125,12 +125,22 @@
+ The number of instances of this service to always have running and
+ waiting for a connection (for faster initial response time).  This
+ integer value is optional.
++.br
++.sp
++For datagram-based services (udp), the maximum value of prefork is 1.
+ .IP "\fBmaxchild=\fR-1" 5
+ The maximum number of instances of this service to spawn.  A value of
+ -1 means unlimited.  This integer value is optional.
+ .IP "\fBmaxfds=\fR256" 5
+ The maximum number of file descriptors to which to limit this process.
+ This integer value is optional.
++.IP "\fBmaxforkrate=\fR0" 5
++Maximum number of forks per second for this service.  A value of zero
++means unlimited fork rate.  This integer value is optional.
++.IP "\fBbabysit=\fR0" 5
++Set to non-zero to guarantee that at least one child will always be
++available for new connections.  The value of maxchild is ignored if all
++children are busy and babysit is active.  This integer value is optional.
+ .SS EVENTS
+ This section lists processes that should be run at specific intervals,
+ similar to cron jobs.  This section is typically used to perform
+@@ -177,6 +187,6 @@
+ still have separate access control rules.
+ .SH SEE ALSO
+ .PP
+-\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
++\fBcyrmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
+ \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR,
+ \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR
+diff -urNad complete.dpatch/man/deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8
+--- complete.dpatch/man/deliver.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8	2005-11-11 15:34:00.396958358 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH DELIVER 8 "Project Cyrus" CMU
++.TH CYRDELIVER 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: deliver.8,v 1.18 2004/06/21 18:40:10 rjs3 Exp $
+ .SH NAME
+-deliver \- deliver mail to an IMAP mailbox
++cyrdeliver \- deliver mail to an IMAP mailbox
+ .SH SYNOPSIS
+-.B deliver
++.B cyrdeliver
+ [
+ .B \-C
+ .I config-file
+@@ -76,7 +76,7 @@
+ .I userid
+ ]...
+ .br
+-.B deliver
++.B cyrdeliver
+ [
+ .B \-C
+ .I config-file
+@@ -146,7 +146,7 @@
+ .B \-l
+ Accept messages using the LMTP protocol.
+ .SH NOTES
+-Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver
++Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, cyrdeliver
+ either rejects messages with 8-bit-set characters in the headers or 
+ changes these characters to `X'.
+ This is because such characters can't be interpreted since the
+diff -urNad complete.dpatch/man/fud.8 /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8
+--- complete.dpatch/man/fud.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8	2005-11-11 15:34:00.396958358 +0100
+@@ -61,7 +61,7 @@
+ ]
+ .SH DESCRIPTION
+ .B FUD
+-is a long lived datagram daemon started from master that provides
++is a long lived datagram daemon started from cyrmaster that provides
+ information about when a user last
+ read their mail, when mail last arrived in a user's mailbox, and how
+ many messages are recent for that user.
+diff -urNad complete.dpatch/man/idled.8 /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8
+--- complete.dpatch/man/idled.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8	2005-11-11 15:34:00.397958261 +0100
+@@ -56,7 +56,7 @@
+ to report the changes to the client.
+ .I Idled
+ is usually started from
+-.I master.
++.I cyrmaster.
+ .PP
+ .I Idled
+ reads its configuration options out of the
+@@ -75,4 +75,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/imapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8
+--- complete.dpatch/man/imapd.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8	2005-11-11 15:34:00.397958261 +0100
+@@ -72,7 +72,7 @@
+ is an IMAP4rev1 server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Imapd
+@@ -148,4 +148,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/lmtpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8
+--- complete.dpatch/man/lmtpd.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8	2005-11-11 15:34:00.397958261 +0100
+@@ -68,7 +68,7 @@
+ is an LMTP server used to deliver mail to the IMAP mailstore.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Lmtpd
+@@ -101,4 +101,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/master.8 /tmp/dpep.8HKnp3/complete.dpatch/man/master.8
+--- complete.dpatch/man/master.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/master.8	2005-11-11 15:34:00.398958163 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH MASTER 8 "Project Cyrus" CMU
++.TH CYRMASTER 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1996-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: master.8,v 1.13 2004/12/17 16:32:23 ken3 Exp $
+ .SH NAME
+-master \- master Cyrus process
++cyrmaster \- master Cyrus process
+ .SH SYNOPSIS
+-.B master
++.B cyrmaster
+ [
+ .B \-C
+ .I alternate imapd.conf
+@@ -79,7 +79,7 @@
+ .I snmp agentx socket
+ ]
+ .SH DESCRIPTION
+-.I Master
++.I cyrmaster
+ is the process that controls all of the Cyrus processes. This process
+ is responsible for creating all imapd, pop3d, lmtpd and sieved child
+ processes. This process also initializes the Berkeley DB code and
+@@ -92,12 +92,12 @@
+ .SH OPTIONS
+ .TP
+ .BI \-C " alternate imapd.conf"
+-Specifies an alternate imapd.conf for use by master (note that this will
+-not affect any sub-processes spawned by master, you should specify those
++Specifies an alternate imapd.conf for use by cyrmaster (note that this will
++not affect any sub-processes spawned by cyrmaster, you should specify those
+ specifically in the respective entries in cyrus.conf).
+ .TP
+ .BI \-M " alternate cyrus.conf"
+-Specifies an alternate cyrus.conf for use by master.
++Specifies an alternate cyrus.conf for use by cyrmaster.
+ .TP
+ .BI \-l " listen queue backlog"
+ Increase the listen queue backlog. By default, the listen queue is set
+@@ -113,7 +113,7 @@
+ .BI \-p " pidfile"
+ Use
+ .I pidfile
+-as the pidfile.  If not specified, defaults to /var/run/cyrus-master.pid
++as the pidfile.  If not specified, defaults to /var/run/cyrmaster.pid
+ .TP
+ .BI \-P " snmp agentx ping interval"
+ Sets the amount on time in seconds the subagent will try and reconnect to the
+@@ -132,12 +132,12 @@
+ Requires net-snmp 5.0 or higher.
+ .SH CONFIGURATION
+ Upon execution,
+-.I master
++.I cyrmaster
+ reads its configuration information out of the
+ .IR cyrus.conf (5)
+ file.
+ .PP
+-.I Master
++.I cyrmaster
+ rereads its configuration file when it receives a hangup signal,
+ SIGHUP.  Services and events may be added, deleted or modified when the
+ configuration file is reread.  Any active services removed from the
+@@ -146,9 +146,18 @@
+ The environment variable \fBCYRUS_VERBOSE\fR can be set to log additional
+ debugging information. Setting the value to 1 results in base level logging. 
+ Setting it higher results in more log messages being generated.
++.SH BUGS
++Services do not always go away silently when removed through a SIGHUP.  If
++there are workers of the removed service still running, messages to syslog
++about broken pipes and accept() failures are to be expected.
++.PP
++The in-memory list of services is not cleaned up ever, so a cyrmaster daemon
++that has been sent an extremely high amount of SIGHUP signals to
++add/remove/modify services will lose performance eventually.  Restarting
++cyrmaster fixes this.
+ .SH FILES
+ .TP
+-.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrus-master.pid
++.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrmaster.pid
+ .SH SEE ALSO
+ .PP
+ \fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR,
+diff -urNad complete.dpatch/man/nntpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8
+--- complete.dpatch/man/nntpd.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8	2005-11-11 15:34:00.398958163 +0100
+@@ -74,7 +74,7 @@
+ is a NNTP server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Nntpd
+@@ -142,4 +142,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/notifyd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8
+--- complete.dpatch/man/notifyd.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8	2005-11-11 15:34:00.398958163 +0100
+@@ -62,7 +62,7 @@
+ ]
+ .SH DESCRIPTION
+ .B Notifyd
+-is a daemon started from master(8) that handles notification requests on
++is a daemon started from cyrmaster(8) that handles notification requests on
+ behalf of lmtpd(8).
+ .B Notifyd
+ accepts the request and performs the notification using the method
+@@ -122,4 +122,4 @@
+ Cyrus Master process configuration file.
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrmaster(8)\fR, \fBlmtpd(8)\fR
+diff -urNad complete.dpatch/man/pop3d.8 /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8
+--- complete.dpatch/man/pop3d.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8	2005-11-11 15:34:00.399958065 +0100
+@@ -71,7 +71,7 @@
+ is a POP3 server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Pop3d
+@@ -121,4 +121,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/quota.8 /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8
+--- complete.dpatch/man/quota.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8	2005-11-11 15:34:00.399958065 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH QUOTA 8 "Project Cyrus" CMU
++.TH CYRQUOTA 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: quota.8,v 1.11 2003/10/22 18:50:13 rjs3 Exp $
+ .SH NAME
+-quota \- report and optionally fix quota usage
++cyrquota \- report and optionally fix quota usage
+ .SH SYNOPSIS
+-.B quota
++.B cyrquota
+ [
+ .B \-C
+ .I config-file
+@@ -59,12 +59,12 @@
+ .IR mailbox-prefix ...
+ ]
+ .SH DESCRIPTION
+-.I Quota
++.I cyrquota
+ generates a report listing quota roots, giving their limits and usage.
+ If the
+ .I \-f
+ option is given, 
+-.I quota
++.I cyrquota
+ first fixes any inconsistencies in the quota subsystem, such as
+ mailboxes with the wrong quota root or quota roots with the wrong
+ quota usage reported.
+@@ -79,14 +79,14 @@
+ prefixes.
+ .PP
+ Running
+-.I quota
++.I cyrquota
+ with both the 
+ .I \-f
+ option and
+ .I mailbox-prefix
+ arguments is not recommended.
+ .PP
+-.I Quota
++.I cyrquota
+ reads its configuration options out of the
+ .IR imapd.conf (5)
+ file unless specified otherwise by \fB-C\fR.
+diff -urNad complete.dpatch/man/reconstruct.8 /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8
+--- complete.dpatch/man/reconstruct.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8	2005-11-11 15:34:00.399958065 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH RECONSTRUCT 8 "Project Cyrus" CMU
++.TH CYRRECONSTRUCT 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $
+ .SH NAME
+-reconstruct \- reconstruct mailboxes
++cyrreconstruct \- reconstruct mailboxes
+ .SH SYNOPSIS
+-.B reconstruct
++.B cyrreconstruct
+ [
+ .B \-C
+ .I config-file
+@@ -63,14 +63,14 @@
+ ]
+ .IR mailbox ...
+ .br
+-.B reconstruct
++.B cyrreconstruct
+ [
+ .B \-C
+ .I config-file
+ ]
+ .B \-m
+ .SH DESCRIPTION
+-.I Reconstruct
++.I cyrreconstruct
+ rebuilds one or more IMAP mailboxes.  When invoked with the
+ .B \-m
+ switch, it rebuilds the master
+@@ -78,17 +78,17 @@
+ almost any sort of data corruption.
+ .PP
+ If
+-.I Reconstruct
++.I cyrreconstruct
+ can find existing header and index files, it attempts to preserve any
+ data in them that is not derivable from the message files themselves.
+ The state 
+-.I reconstruct
++.I cyrreconstruct
+ attempts to preserve includes the flag names, flag state, and
+ internaldate.
+-.I Reconstruct
++.I cyrreconstruct
+ derives all other information from the message files.
+ .PP
+-.I Reconstruct
++.I cyrreconstruct
+ reads its configuration options out of the
+ .IR imapd.conf (5)
+ file unless specified otherwise by \fB-C\fR.  Any mailbox directory
+@@ -96,12 +96,12 @@
+ .I partition-news
+ configuration option is assumed to be in news format.
+ .PP
+-.I Reconstruct
++.I cyrreconstruct
+ does not adjust the quota usage recorded in any quota
+ root files.  After running
+-.IR reconstruct ,
++.IR cyrreconstruct ,
+ it is advisable to run
+-.IR quota (8)
++.IR cyrquota (8)
+ with the
+ .I \-f
+ switch in order to fix the quota root files.
+diff -urNad complete.dpatch/man/smmapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8
+--- complete.dpatch/man/smmapd.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8	2005-11-11 15:34:00.400957968 +0100
+@@ -67,7 +67,7 @@
+ It accepts commands on its standard input and responds on its standard
+ output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .B SMMAPD
+diff -urNad complete.dpatch/man/timsieved.8 /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8
+--- complete.dpatch/man/timsieved.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8	2005-11-11 15:34:00.400957968 +0100
+@@ -53,7 +53,7 @@
+ is a server that allows users to remotly manage their sieve scripts kept on the server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Timsieved
+@@ -70,4 +70,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/tls_prune.8 /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8
+--- complete.dpatch/man/tls_prune.8	2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8	2005-11-11 15:34:00.400957968 +0100
+@@ -67,4 +67,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/sieve/md5.c /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c
+--- complete.dpatch/sieve/md5.c	2000-01-05 05:51:51.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c	2005-11-11 15:34:48.633248090 +0100
+@@ -31,7 +31,7 @@
+ 
+ #include "md5global.h"
+ #include "md5.h"
+-#include "hmac-md5.h"
++#include "sasl/hmac-md5.h"
+ 
+ /* Constants for MD5Transform routine.
+ */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/06-disable_runpath.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/06-disable_runpath.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-disable_runpath.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable runpath
+
+@DPATCH@
+diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4
+--- complete.dpatch/cmulocal/cyrus.m4	2003-10-08 22:35:24.000000000 +0200
++++ /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4	2005-11-10 18:33:44.832750394 +0100
+@@ -3,6 +3,7 @@
+ dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $
+ dnl tjs@andrew.cmu.edu 6-may-1998
+ dnl
++dnl Debian fix (hmh@debian.org): We don't want runpath set in Debian
+ 
+ dnl It would be good if ANDREW_ADD_LIBPATH could detect if something was
+ dnl already there and not redundantly add it if it is.
+@@ -30,16 +31,8 @@
+ ])
+ 
+ dnl runpath initialization
++dnl (disabled by hmh@debian.org
+ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
+    # CMU GUESS RUNPATH SWITCH
+-  AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
+-    [andrew_runpath_switch="none"])
+-    ])
+-  LDFLAGS="${SAVE_LDFLAGS}"
+-  ])])
++    andrew_runpath_switch="none"
++])
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/07-update_aclocal_and_configure.in.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-update_aclocal.m4.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update aclocal.m4 and configure.in
+
+@DPATCH@
+diff -urNad complete.dpatch/configure.in /tmp/dpep.IJ03bC/complete.dpatch/configure.in
+--- complete.dpatch/configure.in	2005-01-19 00:46:00.000000000 +0100
++++ /tmp/dpep.IJ03bC/complete.dpatch/configure.in	2005-11-10 18:42:37.579406942 +0100
+@@ -51,6 +51,11 @@
+ AC_CONFIG_HEADER(config.h)
+ AC_CANONICAL_HOST
+ 
++dnl Useful for maintainer mode stuff
++WARNERROR=-W
++AC_ARG_ENABLE(warnings-are-errors,[  --enable-warnings-are-errors   add -Werror to most gcc calls], [ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ])
++AC_SUBST(WARNERROR)
++
+ dnl Useful hook for distributions
+ AC_ARG_WITH(extraident,[  --with-extraident=STRING   use STRING as extra version information],
+ 	[AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", [Extra version information for imap/version.h])])
+@@ -94,10 +99,12 @@
+ AC_ISC_POSIX
+ AC_PROG_AWK
+ AC_C_CONST
+-AC_SYS_LONG_FILE_NAMES
+-if test $ac_cv_sys_long_file_names = no; then
+-	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
+-fi
++dnl fakeroot sometimes fails this test
++dnl and Debian always supports long filenames anyway
++dnl AC_SYS_LONG_FILE_NAMES
++dnl if test $ac_cv_sys_long_file_names = no; then
++dnl	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
++dnl fi
+ AC_C_INLINE
+ 
+ CMU_C___ATTRIBUTE__
+@@ -1202,7 +1209,11 @@
+     SQUAT_ENGINE = 1,
+ 
+     /* should we have long LMTP error messages? */
+-    LMTP_LONG_ERROR_MSGS = 1
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
+ };
+ 
+ #endif /* _CYRUS_IMAPD_CONFIG_H_ */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-kerberos-ipv4-ipv6-kludge-removal.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove a kludge which turned IPv4 addresses in IPv6 address space back
+## DP: into real IPv4 addresses.
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c	2005-11-11 00:11:13.000000000 +0100
++++ /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c	2005-11-11 00:15:17.166894681 +0100
+@@ -522,41 +522,6 @@
+ }
+ 
+ #ifdef HAVE_KRB
+-/* translate IPv4 mapped IPv6 address to IPv4 address */
+-#ifdef IN6_IS_ADDR_V4MAPPED
+-static void sockaddr_unmapped(struct sockaddr *sa, socklen_t *len)
+-{
+-    struct sockaddr_in6 *sin6;
+-    struct sockaddr_in *sin4;
+-    uint32_t addr;
+-    int port;
+-
+-    if (sa->sa_family != AF_INET6)
+-	return;
+-    sin6 = (struct sockaddr_in6 *)sa;
+-    if (!IN6_IS_ADDR_V4MAPPED((&sin6->sin6_addr)))
+-	return;
+-    sin4 = (struct sockaddr_in *)sa;
+-    addr = *(uint32_t *)&sin6->sin6_addr.s6_addr[12];
+-    port = sin6->sin6_port;
+-    memset(sin4, 0, sizeof(struct sockaddr_in));
+-    sin4->sin_addr.s_addr = addr;
+-    sin4->sin_port = port;
+-    sin4->sin_family = AF_INET;
+-#ifdef HAVE_SOCKADDR_SA_LEN
+-    sin4->sin_len = sizeof(struct sockaddr_in);
+-#endif
+-    *len = sizeof(struct sockaddr_in);
+-}
+-#else
+-static void sockaddr_unmapped(struct sockaddr *sa __attribute__((unused)),
+-			      socklen_t *len __attribute__((unused)))
+-{
+-    return;
+-}
+-#endif
+-
+-
+ /*
+  * MIT's kludge of a kpop protocol
+  * Client does a krb_sendauth() first thing
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/10-fix_potential_overflows.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/10-fix_potential_overflows.dpatch
@@ -0,0 +1,198 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix_potential_overflows.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix potential buffer overflows
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c
+--- complete.dpatch/imap/ctl_mboxlist.c	2004-05-22 05:45:48.000000000 +0200
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c	2005-11-10 20:38:08.142040412 +0100
+@@ -479,7 +479,7 @@
+     int r = 0;
+     char buf[16384];
+     int line = 0;
+-    char last_commit[MAX_MAILBOX_NAME];
++    char last_commit[MAX_MAILBOX_NAME+1];
+     char *key=NULL, *data=NULL;
+     int keylen, datalen;
+     int untilCommit = PER_COMMIT;
+diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c	2004-12-17 17:32:07.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c	2005-11-10 20:38:44.863358638 +0100
+@@ -119,9 +119,9 @@
+ 
+         while(1) {
+             /* For safety */
+-            memset(username,'\0',MAXLOGNAME + MAXDOMNAME);	
+-            memset(mbox,'\0',MAX_MAILBOX_NAME+1);
+-            memset(buf, '\0', MAXLOGNAME + MAX_MAILBOX_NAME + 1);
++            memset(username,'\0', sizeof(username));	
++            memset(mbox,'\0', sizeof(mbox));
++            memset(buf, '\0', sizeof(buf));
+ 
+ 	    if (signals_poll() == SIGHUP) {
+ 		/* caught a SIGHUP, return */
+diff -urNad complete.dpatch/imap/global.c /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c	2004-11-23 18:40:15.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c	2005-11-10 20:40:02.897537018 +0100
+@@ -467,7 +467,7 @@
+ {
+     struct namespace namespace;
+     char *acl;
+-    char bufuser[MAX_MAILBOX_NAME], inboxname[MAX_MAILBOX_NAME];
++    char bufuser[MAX_MAILBOX_NAME+1], inboxname[MAX_MAILBOX_NAME+1];
+     int r;
+ 
+     /* Set namespace */
+diff -urNad complete.dpatch/imap/idle_idled.c /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c
+--- complete.dpatch/imap/idle_idled.c	2003-10-22 22:05:11.000000000 +0200
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c	2005-11-10 20:40:56.266272619 +0100
+@@ -109,11 +109,11 @@
+     idle_remote.sun_family = AF_UNIX;
+     idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
+     if (idle_sock) {	
+-	strcpy(idle_remote.sun_path, idle_sock);
++	strlcpy(idle_remote.sun_path, idle_sock, sizeof(idle_remote.sun_path));
+     }
+     else {
+-	strcpy(idle_remote.sun_path, config_dir);
+-	strcat(idle_remote.sun_path, FNAME_IDLE_SOCK);
++	strlcpy(idle_remote.sun_path, config_dir, sizeof(idle_remote.sun_path));
++	strlcat(idle_remote.sun_path, FNAME_IDLE_SOCK, sizeof(idle_remote.sun_path));
+     }
+     idle_remote_len = sizeof(idle_remote.sun_family) +
+ 	strlen(idle_remote.sun_path) + 1;
+diff -urNad complete.dpatch/imap/index.c /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c
+--- complete.dpatch/imap/index.c	2005-02-14 17:42:08.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c	2005-11-10 20:42:49.720157772 +0100
+@@ -3278,9 +3278,17 @@
+ 		cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
+ 		break;
+ 	    case SORT_SUBJECT:
+-		cur->xsubj = index_extract_subject(subj + CACHE_ITEM_SIZE_SKIP,
+-						   CACHE_ITEM_LEN(subj),
+-						   &cur->is_refwd);
++		 {
++		     int len = CACHE_ITEM_LEN(subj);
++		     char *t = xmalloc(len+1);
++		
++		     memcpy(t, subj + CACHE_ITEM_SIZE_SKIP, len);
++		     t[len] = '\0';
++		
++		     cur->xsubj = index_extract_subject(t, len, &cur->is_refwd);
++		
++		     free(t);
++		 }
+ 		cur->xsubj_hash = strhash(cur->xsubj);
+ 		break;
+ 	    case SORT_TO:
+diff -urNad complete.dpatch/imap/mboxlist.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h
+--- complete.dpatch/imap/mboxlist.h	2004-03-17 19:07:49.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h	2005-11-10 20:43:33.110906719 +0100
+@@ -73,7 +73,7 @@
+ 
+ /* each mailbox has the following data */
+ struct mbox_entry {
+-    char name[MAX_MAILBOX_NAME];
++    char name[MAX_MAILBOX_NAME+1];
+     int mbtype;
+     char partition[MAX_PARTITION_LEN];
+ 				/* holds remote machine for REMOTE mailboxes */
+diff -urNad complete.dpatch/imap/message.c /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c	2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c	2005-11-10 20:44:17.400567516 +0100
+@@ -795,7 +795,7 @@
+     /* Save header value */
+     len = hdrend - hdr;
+     message_ibuf_ensure(ibuf, len+2);
+-    strncpy(ibuf->end, hdr, len);
++    strncpy(ibuf->end, hdr, len+1);
+     ibuf->end += len;
+     *(ibuf->end)++ = '\r';
+     *(ibuf->end)++ = '\n';
+diff -urNad complete.dpatch/imap/mupdate.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h
+--- complete.dpatch/imap/mupdate.h	2003-12-10 17:07:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h	2005-11-10 20:44:52.257152442 +0100
+@@ -70,8 +70,8 @@
+     struct buf tag, cmd, arg1, arg2, arg3;
+ 
+     /* For client side mupdate_find calls */
+-    char mailbox_buf[MAX_MAILBOX_NAME];
+-    char server_buf[MAX_MAILBOX_NAME];
++    char mailbox_buf[MAX_MAILBOX_NAME+1];
++    char server_buf[MAX_MAILBOX_NAME+1];
+     char *acl_buf;
+     size_t acl_buf_len;
+     struct mupdate_mailboxdata mailboxdata_buf;
+diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c	2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c	2005-11-10 20:46:06.823846583 +0100
+@@ -1277,7 +1277,7 @@
+ 		 char **envp __attribute__((unused)))
+ {
+     socklen_t salen;
+-    char hbuf[NI_MAXHOST];
++    char hbuf[NI_MAXHOST+1];
+     struct sockaddr_storage proxyd_localaddr, proxyd_remoteaddr;
+     char localip[60], remoteip[60];
+     int niflags;
+diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c	2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c	2005-11-10 20:47:18.417831766 +0100
+@@ -1225,7 +1225,7 @@
+ 	
+ 	/* can't have this and a file for input */
+ 	sunsock.sun_family = AF_UNIX;
+-	strcpy(sunsock.sun_path, output_socket);
++	strlcpy(sunsock.sun_path, output_socket, sizeof(sunsock.sun_path));
+ 	unlink(output_socket);
+ 
+ 	listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
+diff -urNad complete.dpatch/master/master.c /tmp/dpep.8ZEecd/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c	2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/master/master.c	2005-11-10 20:50:59.813138032 +0100
+@@ -222,13 +222,17 @@
+     return result;
+ }
+ 
+-void get_prog(char *path, unsigned size, char *const *cmd)
++void get_prog(char *path, unsigned int size, char *const *cmd)
+ {
+     if (cmd[0][0] == '/') {
+ 	/* master lacks strlcpy, due to no libcyrus */
+ 	snprintf(path, size, "%s", cmd[0]);
++	path[size-1] = '\0';
++    }
++    else {
++	snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]);
++	path[size-1] = '\0';
+     }
+-    else snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]);
+ }
+ 
+ void get_statsock(int filedes[2])
+diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c
+--- complete.dpatch/master/masterconf.c	2003-11-25 18:37:19.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c	2005-11-10 20:53:17.940602394 +0100
+@@ -133,7 +133,7 @@
+ 	} else {
+ 	    /* one word */
+ 	    for (i = 0; i < 255; i++) {
+-		if (isspace((int) *p)) break;
++		if ((!*p) || (isspace((int) *p))) break;
+ 		v[i] = *p++;
+ 	    }
+ 	}
+diff -urNad complete.dpatch/notifyd/notifyd.c /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c
+--- complete.dpatch/notifyd/notifyd.c	2004-12-17 17:32:25.000000000 +0100
++++ /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c	2005-11-10 20:55:15.058125035 +0100
+@@ -143,7 +143,7 @@
+ 	if (cp) nopt = strtol(cp, NULL, 10);
+ 	if (nopt < 0 || errno == ERANGE) cp = NULL;
+ 
+-	if (cp && nopt &&
++	if (cp && (nopt > 0) &&
+ 	    !(options = (char**) xrealloc(options, nopt * sizeof(char*)))) {
+ 	    fatal("xmalloc(): can't allocate options", EC_OSERR);
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/11-fix_syslog_prefix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-fix_syslog_prefix.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure all programs log (to syslog) with "cyrus/<program>" as the
+## DP: log prefix.
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c	2005-11-11 13:12:47.000000000 +0100
++++ /tmp/dpep.rKpUur/complete.dpatch/imap/global.c	2005-11-11 13:13:53.042398971 +0100
+@@ -93,6 +93,9 @@
+ struct cyrusdb_backend *config_ptscache_db;
+ #endif
+ 
++/* syslog prefix tag */
++static char syslog_prefix[20];
++
+ /* Called before a cyrus application starts (but after command line parameters
+  * are read) */
+ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+@@ -120,7 +123,9 @@
+     
+     /* xxx we lose here since we can't have the prefix until we load the
+      * config file */
+-    openlog(config_ident, LOG_PID, SYSLOG_FACILITY);
++    strncpy(syslog_prefix, "cyrus/", sizeof(syslog_prefix));
++    strncat(syslog_prefix, ident, sizeof(syslog_prefix) - 7);
++    openlog(syslog_prefix, LOG_PID, SYSLOG_FACILITY);
+ 
+     /* Load configuration file.  This will set config_dir when it finds it */
+     config_read(alt_config);
+diff -urNad complete.dpatch/ptclient/ptexpire.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c
+--- complete.dpatch/ptclient/ptexpire.c	2004-05-26 18:05:59.000000000 +0200
++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c	2005-11-11 13:15:41.839710005 +0100
+@@ -114,7 +114,7 @@
+ 
+     if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+     
+-    openlog("ptexpire", LOG_PID, SYSLOG_FACILITY);
++    openlog("cyrus/ptexpire", LOG_PID, SYSLOG_FACILITY);
+ 
+     while ((opt = getopt(argc, argv, "C:E:")) != EOF) {
+ 	switch (opt) {
+diff -urNad complete.dpatch/ptclient/test.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c
+--- complete.dpatch/ptclient/test.c	2003-10-22 20:50:29.000000000 +0200
++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c	2005-11-11 13:16:19.409019154 +0100
+@@ -57,7 +57,7 @@
+     cacheid=cache;
+   } else
+     cacheid=NULL;
+-  openlog("pttest", LOG_PID, SYSLOG_FACILITY);  
++  openlog("cyrus/pttest", LOG_PID, SYSLOG_FACILITY);  
+   
+   if (!auth_setid(argv[1],cacheid))
+     printf ("Auth_memberof(%s,%s) is %d\n", argv[1], argv[2],
+diff -urNad complete.dpatch/ptclient/test2.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c
+--- complete.dpatch/ptclient/test2.c	2003-10-22 20:50:29.000000000 +0200
++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c	2005-11-11 13:16:39.749020971 +0100
+@@ -46,7 +46,7 @@
+ 
+ int main(void) {
+   char cacheid[16]="4224423";
+-  openlog("testr", LOG_PID, SYSLOG_FACILITY);
++  openlog("cyrus/testr", LOG_PID, SYSLOG_FACILITY);
+   
+   if (!auth_setid("cg2v@club.cc.cmu.edu",cacheid))
+     printf ("Auth_memberof(cg2v,cg2v:me) is %d\n",
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/12-fix_timeout_handling.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/12-fix_timeout_handling.dpatch
@@ -0,0 +1,457 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-fix_timeout_handling.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes timeout handling
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/signals.c /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c
+--- complete.dpatch/imap/signals.c	2005-02-14 17:26:50.000000000 +0100
++++ /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c	2005-11-11 14:10:07.056723830 +0100
+@@ -50,7 +50,7 @@
+ #include "xmalloc.h"
+ #include "exitcodes.h"
+ 
+-static int gotsignal = 0;
++static volatile int gotsignal = 0;
+ 
+ static void sighandler(int sig)
+ {
+diff -urNad complete.dpatch/lib/lock.h /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h
+--- complete.dpatch/lib/lock.h	2003-02-13 21:15:40.000000000 +0100
++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h	2005-11-11 14:10:07.056723830 +0100
+@@ -53,6 +53,8 @@
+ 
+ #include <sys/stat.h>
+ 
++extern int lock_wait_time;
++
+ extern const char *lock_method_desc;
+ 
+ extern int lock_reopen P((int fd, const char *filename,
+diff -urNad complete.dpatch/lib/lock_fcntl.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c
+--- complete.dpatch/lib/lock_fcntl.c	2003-02-13 21:15:40.000000000 +0100
++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c	2005-11-11 14:10:07.057723732 +0100
+@@ -47,11 +47,43 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <syslog.h>
++#include <signal.h>
+ 
+ #include "lock.h"
+ 
+ const char *lock_method_desc = "fcntl";
+ 
++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT;
++
++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */
++
++static volatile int lock_gotsigalrm = 0;
++void lock_sigalrm_handler(int sig __attribute__((unused)))
++{
++    lock_gotsigalrm = 1;
++}
++
++static int setsigalrm(int enable)
++{
++    struct sigaction action;
++
++    sigemptyset(&action.sa_mask);
++    action.sa_flags = SA_RESETHAND;
++
++    if(enable) {
++	action.sa_handler = lock_sigalrm_handler;
++    } else {
++	action.sa_handler = SIG_IGN;
++    }
++    if (sigaction(SIGALRM, &action, NULL) < 0) {
++	syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m");
++	return -1;
++    }
++    lock_gotsigalrm = 0;
++    return 0;
++}
++
+ /*
+  * Block until we obtain an exclusive lock on the file descriptor 'fd',
+  * opened for reading and writing on the file named 'filename'.  If
+@@ -65,12 +97,10 @@
+  * 'failaction' is provided, it is filled in with a pointer to a fixed
+  * string naming the action that failed.
+  *
++ * We use POSIX semanthics and alarm() to avoid deadlocks
++ *
+  */
+-int lock_reopen(fd, filename, sbuf, failaction)
+-int fd;
+-const char *filename;
+-struct stat *sbuf;
+-const char **failaction;
++int lock_reopen (int fd, const char *filename, struct stat *sbuf, const char **failaction)
+ {
+     int r;
+     struct flock fl;
+@@ -79,6 +109,8 @@
+ 
+     if (!sbuf) sbuf = &sbufspare;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_WRLCK;
+ 	fl.l_whence = SEEK_SET;
+@@ -86,8 +118,10 @@
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+ 	if (r == -1) {
+-	    if (errno == EINTR) continue;
+-	    if (failaction) *failaction = "locking";
++	    if (errno == EINTR && !lock_gotsigalrm) continue;
++ 	    if (failaction) *failaction = "locking";
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+@@ -100,10 +134,16 @@
+ 	    fl.l_start = 0;
+ 	    fl.l_len = 0;
+ 	    r = fcntl(fd, F_SETLKW, &fl);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+-	if (sbuf->st_ino == sbuffile.st_ino) return 0;
++	if (sbuf->st_ino == sbuffile.st_ino) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
+ 
+ 	newfd = open(filename, O_RDWR);
+ 	if (newfd == -1) {
+@@ -113,11 +153,15 @@
+ 	    fl.l_start = 0;
+ 	    fl.l_len = 0;
+ 	    r = fcntl(fd, F_SETLKW, &fl);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 	dup2(newfd, fd);
+ 	close(newfd);
+     }
++    alarm(0);
++    setsigalrm(0);
+ }
+ 
+ /*
+@@ -125,22 +169,32 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_blocking(fd)
+-int fd;
++int lock_blocking(int fd)
+ {
+     int r;
+     struct flock fl;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_WRLCK;
+ 	fl.l_whence = SEEK_SET;
+ 	fl.l_start = 0;
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -148,22 +202,32 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_shared(fd)
+-int fd;
++int lock_shared(int fd)
+ {
+     int r;
+     struct flock fl;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_RDLCK;
+ 	fl.l_whence = SEEK_SET;
+ 	fl.l_start = 0;
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -171,8 +235,7 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_nonblocking(fd)
+-int fd;
++int lock_nonblocking(int fd)
+ {
+     int r;
+     struct flock fl;
+@@ -187,10 +250,13 @@
+ 	if (errno == EINTR) continue;
+ 	return -1;
+     }
++    return 0;
+ }
+ 
+ /*
+- * Release any lock on 'fd'.  Always returns success.
++ * Release any lock on 'fd'
++ * Returns 0 for success, -1 for failure, with errno set to an
++ * appropriate error code.
+  */
+ int lock_unlock(int fd)
+ { 
+@@ -209,5 +275,6 @@
+         /* xxx help! */
+         return -1;
+     }
++    return 0;
+ }
+ 
+diff -urNad complete.dpatch/lib/lock_flock.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c
+--- complete.dpatch/lib/lock_flock.c	2003-02-13 21:15:41.000000000 +0100
++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c	2005-11-11 14:10:07.057723732 +0100
+@@ -46,6 +46,8 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <syslog.h>
++#include <signal.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -54,6 +56,36 @@
+ 
+ const char *lock_method_desc = "flock";
+ 
++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT;
++
++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */
++
++static volatile int lock_gotsigalrm = 0;
++void lock_sigalrm_handler(int sig __attribute__((unused)))
++{
++    lock_gotsigalrm = 1;
++}
++
++static int setsigalrm(int enable)
++{
++    struct sigaction action;
++
++    sigemptyset(&action.sa_mask);
++    action.sa_flags = SA_RESETHAND;
++
++    if(enable) {
++	action.sa_handler = lock_sigalrm_handler;
++    } else {
++	action.sa_handler = SIG_IGN;
++    }
++    if (sigaction(SIGALRM, &action, NULL) < 0) {
++	syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m");
++	return -1;
++    }
++    lock_gotsigalrm = 0;
++    return 0;
++}
++
+ /*
+  * Block until we obtain an exclusive lock on the file descriptor 'fd',
+  * opened for reading and writing on the file named 'filename'.  If
+@@ -67,12 +99,10 @@
+  * 'failaction' is provided, it is filled in with a pointer to a fixed
+  * string naming the action that failed.
+  *
++ * We use POSIX semanthics and alarm() to avoid deadlocks
++ *
+  */
+-int lock_reopen(fd, filename, sbuf, failaction)
+-int fd;
+-const char *filename;
+-struct stat *sbuf;
+-const char **failaction;
++int lock_reopen(int fd, const char *filename, struct stat *sbuf, const char **failaction)
+ {
+     int r;
+     struct stat sbuffile, sbufspare;
+@@ -80,11 +110,15 @@
+ 
+     if (!sbuf) sbuf = &sbufspare;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_EX);
+ 	if (r == -1) {
+-	    if (errno == EINTR) continue;
++	    if (errno == EINTR && !lock_gotsigalrm) continue;
+ 	    if (failaction) *failaction = "locking";
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+@@ -93,20 +127,32 @@
+ 	if (r == -1) {
+ 	    if (failaction) *failaction = "stating";
+ 	    flock(fd, LOCK_UN);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+-	if (sbuf->st_ino == sbuffile.st_ino) return 0;
++	if (sbuf->st_ino == sbuffile.st_ino) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++ 
+ 
+ 	newfd = open(filename, O_RDWR);
+ 	if (newfd == -1) {
+ 	    if (failaction) *failaction = "opening";
+ 	    flock(fd, LOCK_UN);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 	dup2(newfd, fd);
+ 	close(newfd);
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -114,17 +160,27 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_blocking(fd)
+-int fd;
++int lock_blocking(int fd)
+ {
+     int r;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_EX);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -132,17 +188,27 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_shared(fd)
+-int fd;
++int lock_shared(int fd)
+ {
+     int r;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_SH);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -164,7 +230,9 @@
+ }
+ 
+ /*
+- * Release any lock on 'fd'.  Always returns success.
++ * Release any lock on 'fd'.
++ * Returns 0 for success, -1 for failure, with errno set to an
++ * appropriate error code.
+  */
+ int lock_unlock(int fd)
+ {
+@@ -174,8 +242,8 @@
+         r = flock(fd, LOCK_UN);
+         if (r != -1) return 0;
+         if (errno == EINTR) continue;
+-        /* xxx help! */
+         return -1;
+     }
++    return 0;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/13-master_process_handling.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/13-master_process_handling.dpatch
@@ -0,0 +1,245 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-master_process_handling.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes process (child) handling in master process
+
+@DPATCH@
+diff -urNad complete.dpatch/master/master.c /tmp/dpep.NKIIR9/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c	2005-11-11 17:03:04.000000000 +0100
++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.c	2005-11-11 17:04:39.273704930 +0100
+@@ -162,6 +162,8 @@
+ static struct centry *ctable[child_table_size];
+ static struct centry *cfreelist;
+ 
++static int child_mourning_time = 2;    /* Time in seconds to remember child
++					  after processing SIGCHLD */
+ static int janitor_frequency = 1;	/* Janitor sweeps per second */
+ static int janitor_position;		/* Entry to begin at in next sweep */
+ static struct timeval janitor_mark;	/* Last time janitor did a sweep */
+@@ -186,9 +188,9 @@
+ int become_cyrus(void)
+ {
+     struct passwd *p;
+-    int newuid, newgid;
++    uid_t newuid, newgid;
+     int result;
+-    static int uid = 0;
++    static uid_t uid = 0;
+ 
+     if (uid) return setuid(uid);
+ 
+@@ -915,7 +917,7 @@
+ 		}
+ 	    }
+ 	    c->service_state = SERVICE_STATE_DEAD;
+-	    c->janitor_deadline = time(NULL) + 2;
++	    c->janitor_deadline = time(NULL) + child_mourning_time;
+ 	} else {
+ 	    /* weird. Are we multithreaded now? we don't know this child */
+ 	    syslog(LOG_WARNING,
+@@ -924,7 +926,7 @@
+ 	    c = get_centry();
+ 	    c->pid = pid;
+ 	    c->service_state = SERVICE_STATE_DEAD;
+-	    c->janitor_deadline = time(NULL) + 2;
++	    c->janitor_deadline = time(NULL) + child_mourning_time;
+ 	    c->si = SERVICE_NONE;
+ 	    c->next = ctable[pid % child_table_size];
+ 	    ctable[pid % child_table_size] = c;
+@@ -1079,6 +1081,36 @@
+     }
+ }
+ 
++/*
++ * Receives a message from a service.
++ *
++ * Returns zero if all goes well
++ * 1 if no msg available
++ * 2 if bad message received (incorrectly sized)
++ * -1 on error (errno set)
++ */
++int read_msg(int fd, struct notify_message *msg)
++{
++    ssize_t r;
++    size_t off = 0;
++    int s = sizeof(struct notify_message);
++    
++    while (s > 0) {
++        do
++            r = read(fd, msg + off, s);
++        while ((r == -1) && (errno == EINTR));
++        if (r <= 0) break;
++        s -= r;
++        off += r;
++    }
++    if ( ((r == 0) && (off == 0)) ||
++         ((r == -1) && (errno == EAGAIN)) )
++        return 1;
++    if (r == -1) return -1;
++    if (s != 0) return 2;
++    return 0;
++}
++
+ void process_msg(const int si, struct notify_message *msg) 
+ {
+     struct centry *c;
+@@ -1392,8 +1424,9 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "cannot find executable for service '%s'", name);
+ 	
+-	/* if it is not, we're misconfigured, die. */
+-	fatal(buf, EX_CONFIG);
++	/* if it is not, we just skip it */
++	syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
++	return;
+     }
+ 
+     Services[i].maxforkrate = maxforkrate;
+@@ -1405,7 +1438,7 @@
+ 	Services[i].desired_workers = prefork;
+ 	Services[i].babysit = babysit;
+ 	Services[i].max_workers = atoi(max);
+-	if (Services[i].max_workers == -1) {
++	if (Services[i].max_workers < 0) {
+ 	    Services[i].max_workers = INT_MAX;
+ 	}
+     } else {
+@@ -1413,6 +1446,7 @@
+ 	if (prefork > 1) prefork = 1;
+ 	Services[i].desired_workers = prefork;
+ 	Services[i].max_workers = 1;
++	Services[i].babysit = 0;
+     }
+     free(max);
+  
+@@ -1452,7 +1486,7 @@
+     if (!cmd) {
+ 	char buf[256];
+ 	snprintf(buf, sizeof(buf),
+-		 "unable to find command or port for event '%s'", name);
++		 "unable to find command for event '%s'", name);
+ 
+ 	if (ignore_err) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+@@ -1506,7 +1540,7 @@
+ 
+     rl.rlim_cur = x;
+     rl.rlim_max = x;
+-    if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) {
++    if (setrlimit(RLIMIT_NUMFDS, &rl) < 0 && x != RLIM_INFINITY) {
+ 	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
+ 
+ #ifdef HAVE_GETRLIMIT
+@@ -1521,11 +1555,9 @@
+     }
+ 
+ 
+-    if (verbose > 1) {
+-	r = getrlimit(RLIMIT_NUMFDS, &rl);
+-	syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld", rl.rlim_cur,
+-	       rl.rlim_max);
+-    }
++    if (verbose > 1 && getrlimit(RLIMIT_NUMFDS, &rl) >=0)
++	syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld",
++		rl.rlim_cur, rl.rlim_max);
+ #else
+     }
+ #endif /* HAVE_GETRLIMIT */
+@@ -1544,7 +1576,10 @@
+ 
+     /* disable all services -
+        they will be re-enabled if they appear in config file */
+-    for (i = 0; i < nservices; i++) Services[i].exec = NULL;
++    for (i = 0; i < nservices; i++) {
++	if (Services[i].exec) free((void*)Services[i].exec);
++	Services[i].exec = NULL;
++    }
+ 
+     /* read services */
+     masterconf_getsection("SERVICES", &add_service, (void*) 1);
+@@ -1559,13 +1594,18 @@
+ 		       Services[i].stat[0], Services[i].stat[1]);
+ 
+ 	    /* Only free the service info on the primary */
+-	    if(Services[i].associate == 0) {
++	    if (Services[i].associate == 0) {
++		free(Services[i].name);
+ 		free(Services[i].listen);
+ 		free(Services[i].proto);
+ 	    }
++	    Services[i].name = NULL;
+ 	    Services[i].listen = NULL;
+ 	    Services[i].proto = NULL;
+ 	    Services[i].desired_workers = 0;
++	    Services[i].nforks = 0;
++	    Services[i].nactive = 0;
++	    Services[i].nconnections = 0;
+ 
+ 	    /* send SIGHUP to all children */
+ 	    for (j = 0 ; j < child_table_size ; j++ ) {
+@@ -1648,9 +1688,9 @@
+     p = getenv("CYRUS_VERBOSE");
+     if (p) verbose = atoi(p) + 1;
+ #ifdef HAVE_NETSNMP
+-    while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:P:x:")) != EOF) {
++    while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:P:x:")) != EOF) {
+ #else
+-    while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:")) != EOF) {
++    while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:")) != EOF) {
+ #endif
+ 	switch (opt) {
+ 	case 'C': /* alt imapd.conf file */
+@@ -1683,8 +1723,15 @@
+ 	    /* Janitor frequency */
+ 	    janitor_frequency = atoi(optarg);
+ 	    if(janitor_frequency < 1)
+-		fatal("The janitor period must be at least 1 second", EX_CONFIG);
++		fatal("The janitor frequency must be at least once per second", EX_CONFIG);
+ 	    break;   
++       case 'J':
++           /* Janitor delay before cleanup of a child */
++           child_mourning_time = atoi(optarg);
++           if(child_mourning_time < 1)
++               fatal("The janitor's mourning time interval must be at least 1 second",
++                       EX_CONFIG);
++           break;
+ #ifdef HAVE_NETSNMP
+ 	case 'P': /* snmp AgentXPingInterval */
+ 	    agentxpinginterval = atoi(optarg);
+@@ -2060,13 +2107,19 @@
+ 	    int j;
+ 
+ 	    if (FD_ISSET(x, &rfds)) {
+-		r = read(x, &msg, sizeof(msg));
+-		if (r != sizeof(msg)) {
+-		    syslog(LOG_ERR, "got incorrectly sized response from child: %x", i);
++		while ((r = read_msg(x, &msg)) == 0)
++		    process_msg(i, &msg);
++	
++		if (r == 2) {
++		    syslog(LOG_ERR,
++			"got incorrectly sized response from child: %x", i);
++		    continue;
++		}
++		if (r < 0) {
++		    syslog(LOG_ERR,
++			"error while receiving message from child %x: %m", i);
+ 		    continue;
+ 		}
+-		
+-		process_msg(i, &msg);
+ 	    }
+ 
+ 	    if (Services[i].exec &&
+diff -urNad complete.dpatch/master/master.h /tmp/dpep.NKIIR9/complete.dpatch/master/master.h
+--- complete.dpatch/master/master.h	2005-11-11 17:03:03.000000000 +0100
++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.h	2005-11-11 17:03:04.650994659 +0100
+@@ -43,6 +43,7 @@
+ extern struct service *Services;
+ extern int allocservices;
+ extern int nservices;
++void sighandler_setup(void);
+ 
+ /*
+  * Description of multiple address family support from
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/14-xmalloc.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/14-xmalloc.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-xmalloc.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix xmalloc usage
+
+@DPATCH@
+diff -urNad complete.dpatch/lib/map_stupidshared.c /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c
+--- complete.dpatch/lib/map_stupidshared.c	2003-10-22 20:50:12.000000000 +0200
++++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c	2005-11-11 14:29:02.586035529 +0100
+@@ -52,6 +52,7 @@
+ #include <sys/stat.h>
+ #include <syslog.h>
+ 
++#include "xmalloc.h"
+ #include "map.h"
+ #include "exitcodes.h"
+ 
+diff -urNad complete.dpatch/lib/xmalloc.h /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h
+--- complete.dpatch/lib/xmalloc.h	2003-10-22 20:50:12.000000000 +0200
++++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h	2005-11-11 14:29:30.174327237 +0100
+@@ -65,7 +65,7 @@
+ 
+ /* Functions using xmalloc.h must provide a function called fatal() conforming
+    to the following: */
+-extern void fatal(const char *fatal_message, int fatal_code);
+-/*   __attribute__ ((noreturn));*/
++extern void fatal(const char *fatal_message, int fatal_code)
++   __attribute__ ((noreturn));
+ 
+ #endif /* INCLUDED_XMALLOC_H */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/15-munge_8bit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/15-munge_8bit.dpatch
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_munge_8bit.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for munge8bit
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c	2004-09-16 19:58:54.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c	2005-11-10 17:02:02.658034914 +0100
+@@ -227,6 +227,7 @@
+     int n;
+     int sawcr = 0, sawnl;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     int inheader = 1, blankline = 1;
+ 
+     while (size) {
+@@ -262,7 +263,7 @@
+ 			/* We have been configured to reject all mail of this
+ 			   form. */
+ 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			*p = 'X';
+diff -urNad complete.dpatch/imap/spool.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c
+--- complete.dpatch/imap/spool.c	2004-10-27 22:40:50.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c	2005-11-10 17:02:02.658034914 +0100
+@@ -140,6 +140,7 @@
+     state s = NAME_START;
+     int r = 0;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     const char **skip = NULL;
+ 
+     if (namelen == 0) {
+@@ -266,7 +267,7 @@
+ 			   form. */
+ 			r = IMAP_MESSAGE_CONTAINS8BIT;
+ 			goto ph_error;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			c = 'X';
+diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions	2004-07-21 21:07:45.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions	2005-11-10 17:02:02.659034816 +0100
+@@ -458,6 +458,11 @@
+ { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")}
+ /* The cyrusdb backend to use for the mailbox list. */
+ 
++{ "munge8bit", 1, SWITCH }
++/* If enabled, lmtpd changes 8-bit characters to `X'. Also see reject8bit.
++   (A proper soultion to non-ASCII characters in headers is offered by  
++   RFC 2047 and its predecessors.) */
++
+ # xxx badly worded
+ { "mupdate_connections_max", 128, INT }
+ /* The max number of connections that a mupdate process will allow, this
+@@ -670,9 +675,9 @@
+ 
+ { "reject8bit", 0, SWITCH }
+ /* 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.) */
++   headers. Also see munge8bit, which is only applied if reject8bit is
++   not activated. (A proper soultion to non-ASCII characters in headers
++   is offered by RFC 2047 and its predecessors.) */
+ 
+ { "rfc2046_strict", 0, SWITCH }
+ /* If enabled, imapd will be strict (per RFC 2046) when matching MIME
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/16-fix_mib.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/16-fix_mib.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16-fix_mib.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix MIB file for cyrus
+
+@DPATCH@
+diff -urNad complete.dpatch/master/CYRUS-MASTER.mib /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib
+--- complete.dpatch/master/CYRUS-MASTER.mib	2001-08-14 18:11:26.000000000 +0200
++++ /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib	2005-11-10 17:11:15.237608454 +0100
+@@ -1,12 +1,15 @@
+ CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN
+ 
+ IMPORTS
+-    MODULE-IDENTITY, OBJECT-TYPE, Counter32
++    MODULE-IDENTITY, OBJECT-TYPE, Counter32, enterprises
+         FROM SNMPv2-SMI
+     DisplayString
+-        FROM SNMPv2-TC
+-    cmuCyrus
+-        FROM CMU-MIB;
++        FROM SNMPv2-TC;
++--    cmuCyrus
++--        FROM CMU-MIB;
++
++cmuMIB         OBJECT IDENTIFIER ::= { enterprises 3 }
++cmuCyrus       OBJECT IDENTIFIER ::= { cmuMIB 6 }
+ 
+ cyrusMasterMIB MODULE-IDENTITY
+     LAST-UPDATED "0010312300Z"		-- 2000 Oct 31
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17-fix_tail_syntax_in_xversion.h.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix tail syntax in xversion.h (use "tail -n 1" instead of "tail -1")
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/xversion.sh /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh
+--- complete.dpatch/imap/xversion.sh	2003-10-22 20:03:00.000000000 +0200
++++ /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh	2005-11-10 17:14:52.208238481 +0100
+@@ -22,4 +22,4 @@
+ 	match ($0, pattern) {
+ 	    printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ 	}' pattern="$DATEPAT $TIMEPAT" | \
+-	sort | tail -1 >> xversion.h
++	sort | tail -n 1 >> xversion.h
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/18-fix_strlen_return_type.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch
@@ -0,0 +1,606 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18-fix_strlen_return_type.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix return type of strlen calls and snprintf/prot_printf format
+## DP: strings.
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c	2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c	2005-11-11 16:17:00.679913340 +0100
+@@ -6095,8 +6095,8 @@
+     memset(&tmp, 0, sizeof(struct buf));
+     memset(&user, 0, sizeof(struct buf));
+ 
+-    prot_printf(pout, "ACL0 GETACL {%d+}\r\n%s\r\n",
+-		strlen(mailbox), mailbox);
++    prot_printf(pout, "ACL0 GETACL {%lu+}\r\n%s\r\n",
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     while(1) {
+ 	c = getword(pin, &tag);
+@@ -6146,9 +6146,9 @@
+ 
+ 		snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
+ 		
+-		prot_printf(pout, "%s DELETEACL {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			    tagbuf, strlen(mailbox), mailbox,
+-			    strlen(user.s), user.s);
++		prot_printf(pout, "%s DELETEACL {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			    tagbuf, (unsigned long) strlen(mailbox), mailbox,
++			    (unsigned long) strlen(user.s), user.s);
+ 		if(c == '\r') {
+ 		    c = prot_getc(pin);
+ 		    if(c != '\n') {
+@@ -6223,11 +6223,11 @@
+ 
+ 	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
+ 	
+-	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+ 		    mailboxlen, mailbox,
+-		    strlen(acl), acl,
+-		    strlen(rights), rights);
++		    (unsigned long) strlen(acl), acl,
++		    (unsigned long) strlen(rights), rights);
+ 
+ 	while(1) {
+ 	    c = getword(pin, &inbuf);
+@@ -6341,11 +6341,11 @@
+     if(!r) {
+ 	if(topart) {
+ 	    /* need to send partition as an atom */
+-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s %s\r\n",
+-			strlen(name), name, topart);
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s %s\r\n",
++			(unsigned long) strlen(name), name, topart);
+ 	} else {
+-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s\r\n",
+-			strlen(name), name);
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
+ 	}
+ 	r = getresult(be->in, "LC1");
+ 	if(r) syslog(LOG_ERR, "Could not move mailbox: %s, LOCALCREATE failed",
+@@ -6379,7 +6379,8 @@
+     if(!r) {
+ 	backout_mupdate = 1;
+ 
+-	prot_printf(be->out, "D01 UNDUMP {%d+}\r\n%s ", strlen(name), name);
++	prot_printf(be->out, "D01 UNDUMP {%lu+}\r\n%s ",
++		    (unsigned long) strlen(name), name);
+ 
+ 	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
+ 			 imapd_authstate);
+@@ -6425,8 +6426,8 @@
+ 	/* 6.5) Kick remote server to correct mupdate entry */
+ 	/* Note that we don't really care if this succeeds or not */
+ 	if (mupdate_h) {
+-	    prot_printf(be->out, "MP1 MUPDATEPUSH {%d+}\r\n%s\r\n",
+-			strlen(name), name);
++	    prot_printf(be->out, "MP1 MUPDATEPUSH {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
+ 	    rerr = getresult(be->in, "MP1");
+ 	    if(rerr) {
+ 		syslog(LOG_ERR,
+@@ -6465,8 +6466,8 @@
+     }
+     if(r && backout_remotebox) {
+ 	rerr = 0;
+-	prot_printf(be->out, "LD1 LOCALDELETE {%d+}\r\n%s\r\n",
+-		    strlen(name), name);
++	prot_printf(be->out, "LD1 LOCALDELETE {%lu+}\r\n%s\r\n",
++		    (unsigned long) strlen(name), name);
+ 	rerr = getresult(be->in, "LD1");
+  	if(rerr) {
+ 	    syslog(LOG_ERR,
+@@ -6661,9 +6662,10 @@
+ 	    if(!r) {
+ 		/* note use of + to force the setting of a nonexistant
+ 		 * quotaroot */
+-		prot_printf(be->out, "Q01 SETQUOTA {%d+}\r\n" \
++		prot_printf(be->out, "Q01 SETQUOTA {%lu+}\r\n" \
+ 			    "+%s (STORAGE %d)\r\n",
+-			    strlen(name)+1, name, quota.limit);
++			    (unsigned long) strlen(name)+1,
++			    name, quota.limit);
+ 		r = getresult(be->in, "Q01");
+ 		if(r) syslog(LOG_ERR,
+ 			     "Could not move mailbox: %s, " \
+@@ -7207,7 +7209,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(imapd_out, "\"%s\"", s);
+     }
+@@ -7237,7 +7239,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(imapd_out, "\"%s\"", s);
+     }
+diff -urNad complete.dpatch/imap/mbdump.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c
+--- complete.dpatch/imap/mbdump.c	2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c	2005-11-11 16:17:00.679913340 +0100
+@@ -271,8 +271,8 @@
+ 
+ 	/* send filename, size, and contents */
+ 	if(first) {
+-	    prot_printf(pout, "{%d}\r\n",
+-			strlen(name));
++	    prot_printf(pout, "{%lu}\r\n",
++			(unsigned long) strlen(name));
+ 
+ 	    if(!tag) {
+ 		/* synchronize */
+@@ -292,8 +292,8 @@
+ 
+ 	    first = 0;
+ 	} else {
+-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-			strlen(name),
++	    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++			(unsigned long) strlen(name),
+ 			(!tag ? "+" : ""),
+ 			name, len,
+ 			(!tag ? "+" : ""));
+@@ -327,8 +327,8 @@
+ 
+ 	/* send filename, size, and contents */
+ 	if(first) {
+-	    prot_printf(pout, "{%d}\r\n",
+-			strlen(data_files[i]));
++	    prot_printf(pout, "{%lu}\r\n",
++			(unsigned long) strlen(data_files[i]));
+ 	    
+ 	    if(!tag) {
+ 		/* synchronize */
+@@ -347,8 +347,8 @@
+ 			(!tag ? "+" : ""));
+ 	    first = 0;
+ 	} else {
+-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-			strlen(data_files[i]),
++	    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++			(unsigned long) strlen(data_files[i]),
+ 			(!tag ? "+" : ""),
+ 			data_files[i], len,
+ 			(!tag ? "+" : ""));
+@@ -474,8 +474,8 @@
+ 				snprintf(ext_fname, sizeof(ext_fname),
+ 					 "SIEVE-%s", next->d_name);
+ 			    }
+-			    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-					strlen(ext_fname), 
++			    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++					(unsigned long) strlen(ext_fname), 
+ 					(!tag ? "+" : ""),
+ 					ext_fname,
+ 					len,
+diff -urNad complete.dpatch/imap/message.c /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c	2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c	2005-11-11 16:17:00.681913145 +0100
+@@ -2060,7 +2060,7 @@
+     if (*p || len >= 1024) {
+ 	/* Write out as literal */
+ 	char buf[100];
+-	snprintf(buf, sizeof(buf), "{%u}\r\n", strlen(s));
++	snprintf(buf, sizeof(buf), "{%lu}\r\n", (unsigned long) strlen(s));
+ 	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
+ 	for (p = buf; *p; p++) *(ibuf->end)++ = *p;
+ 	for (p = s; *p; p++) *(ibuf->end)++ = *p;
+diff -urNad complete.dpatch/imap/mupdate-client.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c
+--- complete.dpatch/imap/mupdate-client.c	2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c	2005-11-11 16:17:00.681913145 +0100
+@@ -330,9 +330,11 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u ACTIVATE {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server, strlen(acl), acl);
++		"X%u ACTIVATE {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox,
++		(unsigned long) strlen(server), server,
++		(unsigned long) strlen(acl), acl);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -355,9 +357,10 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server);
++		"X%u RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox, 
++		(unsigned long) strlen(server), server);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -380,9 +383,10 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u DEACTIVATE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server);
++		"X%u DEACTIVATE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox, 
++		(unsigned long) strlen(server), server);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -405,8 +409,8 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u DELETE {%d+}\r\n%s\r\n", handle->tagn++, 
+-		strlen(mailbox), mailbox);
++		"X%u DELETE {%lu+}\r\n%s\r\n", handle->tagn++, 
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -474,8 +478,8 @@
+     if(!handle || !mailbox || !target) return MUPDATE_BADPARAM;
+ 
+     prot_printf(handle->pout,
+-		"X%u FIND {%d+}\r\n%s\r\n", handle->tagn++, 
+-		strlen(mailbox), mailbox);
++		"X%u FIND {%lu+}\r\n%s\r\n", handle->tagn++, 
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));
+ 
+@@ -507,8 +511,8 @@
+ 
+     if(prefix) {
+ 	prot_printf(handle->pout,
+-		    "X%u LIST {%d+}\r\n%s\r\n", handle->tagn++,
+-		    strlen(prefix), prefix);
++		    "X%u LIST {%lu+}\r\n%s\r\n", handle->tagn++,
++		    (unsigned long) strlen(prefix), prefix);
+     } else {
+ 	prot_printf(handle->pout,
+ 		    "X%u LIST\r\n", handle->tagn++);
+diff -urNad complete.dpatch/imap/mupdate.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c
+--- complete.dpatch/imap/mupdate.c	2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c	2005-11-11 16:17:00.682913047 +0100
+@@ -1613,20 +1613,20 @@
+     pthread_mutex_unlock(&mailboxes_mutex); /* UNLOCK */
+ 
+     if (m && m->t == SET_ACTIVE) {
+-	prot_printf(C->pout, "%s MAILBOX {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(C->pout, "%s MAILBOX {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+-		    strlen(m->mailbox), m->mailbox,
+-		    strlen(m->server), m->server,
+-		    strlen(m->acl), m->acl);
++		    (unsigned long) strlen(m->mailbox), m->mailbox,
++		    (unsigned long) strlen(m->server), m->server,
++		    (unsigned long) strlen(m->acl), m->acl);
+     } else if (m && m->t == SET_RESERVE) {
+-	prot_printf(C->pout, "%s RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(C->pout, "%s RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+-		    strlen(m->mailbox), m->mailbox,
+-		    strlen(m->server), m->server);
++		    (unsigned long) strlen(m->mailbox), m->mailbox,
++		    (unsigned long) strlen(m->server), m->server);
+     } else if (send_delete) {
+ 	/* not found, if needed, send a delete */
+-	prot_printf(C->pout, "%s DELETE {%d+}\r\n%s\r\n",
+-		    tag, strlen(mailbox), mailbox);
++	prot_printf(C->pout, "%s DELETE {%lu+}\r\n%s\r\n",
++		    tag, (unsigned long) strlen(mailbox), mailbox);
+     }
+     
+     free_mbent(m);
+@@ -1668,17 +1668,17 @@
+ 	    switch (m->t) {
+ 	    case SET_ACTIVE:
+ 		prot_printf(C->pout,
+-			    "%s MAILBOX {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++			    "%s MAILBOX {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 			    C->streaming,
+-			    strlen(m->mailbox), m->mailbox,
+-			    strlen(m->server), m->server,
+-			    strlen(m->acl), m->acl);
++			    (unsigned long) strlen(m->mailbox), m->mailbox,
++			    (unsigned long) strlen(m->server), m->server,
++			    (unsigned long) strlen(m->acl), m->acl);
+ 		break;
+ 	    case SET_RESERVE:
+-		prot_printf(C->pout, "%s RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
++		prot_printf(C->pout, "%s RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 			    C->streaming,
+-			    strlen(m->mailbox), m->mailbox,
+-			    strlen(m->server), m->server);
++			    (unsigned long) strlen(m->mailbox), m->mailbox,
++			    (unsigned long) strlen(m->server), m->server);
+ 		break;
+ 		
+ 	    case SET_DELETE:
+diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c	2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c	2005-11-11 16:17:00.685912753 +0100
+@@ -2837,7 +2837,8 @@
+     if (!r) {
+ 	int is_active = 1;
+ 	s->context = (void*) &is_active;
+-	prot_printf(s->out, "%s Append {%d+}\r\n%s ", tag, strlen(name), name);
++ 	prot_printf(s->out, "%s Append {%lu+}\r\n%s ", tag,
++ 			(unsigned long) strlen(name), name);
+ 	if (!(r = pipe_command(s, 16384))) {
+ 	    pipe_until_tag(s, tag, 0);
+ 	}
+@@ -2913,8 +2914,8 @@
+ 	return;
+     }
+ 
+-    prot_printf(backend_current->out, "%s %s {%d+}\r\n%s\r\n", tag, cmd, 
+-		strlen(name), name);
++    prot_printf(backend_current->out, "%s %s {%lu+}\r\n%s\r\n", tag, cmd, 
++		(unsigned long) strlen(name), name);
+     switch (pipe_including_tag(backend_current, tag, 0)) {
+     case PROXY_OK:
+ 	proc_register("proxyd", proxyd_clienthost, proxyd_userid, mailboxname);
+@@ -3144,8 +3145,9 @@
+ 		    r == 0 ? "[TRYCREATE] " : "", error_message(r));
+     } else if (s == backend_current) {
+ 	/* this is the easy case */
+-	prot_printf(backend_current->out, "%s %s %s {%d+}\r\n%s\r\n",
+-		    tag, cmd, sequence, strlen(name), name);
++	prot_printf(backend_current->out, "%s %s %s {%lu+}\r\n%s\r\n",
++		    tag, cmd, sequence, 
++		    (unsigned long) strlen(name), name);
+ 	pipe_including_tag(backend_current, tag, 0);
+     } else {
+ 	char mytag[128];
+@@ -3306,7 +3308,8 @@
+ 	}
+ 
+ 	/* start the append */
+-	prot_printf(s->out, "%s Append {%d+}\r\n%s", tag, strlen(name), name);
++	prot_printf(s->out, "%s Append {%lu+}\r\n%s", tag,
++			(unsigned long) strlen(name), name);
+ 	prot_printf(backend_current->out, "%s %s %s (Rfc822.peek)\r\n",
+ 		    mytag, usinguid ? "Uid Fetch" : "Fetch", sequence);
+ 	for (/* each FETCH response */;;) {
+@@ -3551,8 +3554,8 @@
+ 
+     if (!r) {
+ 	/* ok, send the create to that server */
+-	prot_printf(s->out, "%s CREATE {%d+}\r\n%s\r\n", 
+-		    tag, strlen(name), name);
++	prot_printf(s->out, "%s CREATE {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(name), name);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 	
+@@ -3592,8 +3595,8 @@
+     }
+ 
+     if (!r) {
+-	prot_printf(s->out, "%s DELETE {%d+}\r\n%s\r\n", 
+-		    tag, strlen(name), name);
++	prot_printf(s->out, "%s DELETE {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(name), name);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 
+@@ -3694,17 +3697,17 @@
+ 		/* Cross Server */
+ 		/* <tag> XFER <name> <dest server> <dest partition> */
+ 		prot_printf(s->out,
+-			    "%s XFER {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-			    tag, strlen(oldname), oldname,
+-			    strlen(newserver), newserver,
+-			    strlen(destpart), destpart);
++			    "%s XFER {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++			    tag, (unsigned long) strlen(oldname), oldname,
++			    (unsigned long) strlen(newserver), newserver,
++			    (unsigned long) strlen(destpart), destpart);
+ 	    }
+ 	    
+ 	} else {
+ 	    /* <tag> XFER <name> <dest server> */
+-	    prot_printf(s->out, "%s XFER {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-			tag, strlen(oldname), oldname,
+-			strlen(partition), partition);
++	    prot_printf(s->out, "%s XFER {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++			tag, (unsigned long) strlen(oldname), oldname,
++			(unsigned long) strlen(partition), partition);
+ 	}
+ 	
+ 	res = pipe_including_tag(s, tag, 0);
+@@ -3720,9 +3723,9 @@
+ 	    /* do MUPDATE create operations for new mailbox */
+ 	}
+ 
+-	prot_printf(s->out, "%s RENAME {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-		    tag, strlen(oldname), oldname,
+-		    strlen(newname), newname);
++	prot_printf(s->out, "%s RENAME {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(oldname), oldname,
++		    (unsigned long) strlen(newname), newname);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 	
+@@ -3757,8 +3760,8 @@
+ 
+ 	if (backend_inbox) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s Lsub \"\" {%d+}\r\n%s\r\n",
+-			tag, strlen(pattern), pattern);
++			"%s Lsub \"\" {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(pattern), pattern);
+ 	    pipe_lsub(backend_inbox, tag, 0, "MAILBOX");
+ 	} else {		/* user doesn't have an INBOX */
+ 	    /* noop */
+@@ -3827,9 +3830,9 @@
+ 
+ 	if (backend_inbox) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s Lsub {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(reference), reference,
+-			strlen(pattern), pattern);
++			"%s Lsub {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(reference), reference,
++			(unsigned long) strlen(pattern), pattern);
+ 	    pipe_lsub(backend_inbox, tag, 0, (listopts & LIST_LSUB) ? "LSUB" : "LIST");
+ 	} else {		/* user doesn't have an INBOX */
+ 	    /* noop */
+@@ -3918,14 +3921,14 @@
+ 	
+ 	if (namespace) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s %s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
++			"%s %s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
+ 			tag, cmd, 
+-			strlen(namespace), namespace,
+-			strlen(name), name);
++			(unsigned long) strlen(namespace), namespace,
++			(unsigned long) strlen(name), name);
+ 	} else {
+-	    prot_printf(backend_inbox->out, "%s %s {%d+}\r\n%s\r\n", 
++	    prot_printf(backend_inbox->out, "%s %s {%lu+}\r\n%s\r\n", 
+ 			tag, cmd, 
+-			strlen(name), name);
++			(unsigned long) strlen(name), name);
+ 	}
+ 	pipe_including_tag(backend_inbox, tag, 0);
+     } else {
+@@ -4157,15 +4160,15 @@
+     } else if (!r) {
+ 	if (rights) {
+ 	    prot_printf(s->out, 
+-			"%s Setacl {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name,
+-			strlen(identifier), identifier,
+-			strlen(rights), rights);
++			"%s Setacl {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name,
++			(unsigned long) strlen(identifier), identifier,
++			(unsigned long) strlen(rights), rights);
+ 	} else {
+ 	    prot_printf(s->out, 
+-			"%s Deleteacl {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name,
+-			strlen(identifier), identifier);
++			"%s Deleteacl {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name,
++			(unsigned long) strlen(identifier), identifier);
+ 	}	    
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+@@ -4265,8 +4268,8 @@
+ 	if (!r) s = proxyd_findserver(server);
+ 
+ 	if (s) {
+-	    prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name);
++	    prot_printf(s->out, "%s Getquotaroot {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name);
+ 	    pipe_including_tag(s, tag, 0);
+ 	} else {
+ 	    r = IMAP_SERVER_UNAVAILABLE;
+@@ -4492,8 +4495,8 @@
+     if (!r) s = proxyd_findserver(server);
+     if (!r && !s) r = IMAP_SERVER_UNAVAILABLE;
+     if (!r) {
+-	prot_printf(s->out, "%s Status {%d+}\r\n%s ", tag,
+-		    strlen(name), name);
++	prot_printf(s->out, "%s Status {%lu+}\r\n%s ", tag,
++		    (unsigned long) strlen(name), name);
+ 	if (!pipe_command(s, 65536)) {
+ 	    pipe_until_tag(s, tag, 0);
+ 	}
+@@ -4633,7 +4636,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(proxyd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(proxyd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(proxyd_out, "\"%s\"", s);
+     }
+@@ -4661,7 +4664,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(proxyd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(proxyd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(proxyd_out, "\"%s\"", s);
+     }
+diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c	2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c	2005-11-11 17:01:17.683492575 +0100
+@@ -624,14 +624,14 @@
+ 	return (ret);
+     
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+-	       (unsigned int) bio, (long unsigned int) argp,
++	printf("read from %p [%p] (%d bytes => %ld (0x%X))\n",
++	       (void*) bio, (void*) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+ 	return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+-	       (unsigned int) bio, (long unsigned int) argp,
++	printf("write to %p [%p] (%d bytes => %ld (0x%X))\n",
++	       (void*) bio, (void*) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+     }
+@@ -1771,7 +1771,8 @@
+ {
+     int lup;
+     
+-    prot_printf(pout,"A003 APPEND %s (\\Seen) {%u}\r\n",mbox,size+strlen(HEADERS));
++    prot_printf(pout,"A003 APPEND %s (\\Seen) {%lu}\r\n",mbox,
++		    (unsigned long) size+strlen(HEADERS));
+     /* do normal header foo */
+     prot_printf(pout,HEADERS);
+     
+diff -urNad complete.dpatch/master/master.c /tmp/dpep.2wtF9E/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c	2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/master/master.c	2005-11-11 16:17:00.688912460 +0100
+@@ -1888,7 +1888,7 @@
+ 	    }
+ 	    
+ 	    /* Write PID */
+-	    snprintf(buf, sizeof(buf), "%lu\n", (unsigned long int)getpid());
++	    snprintf(buf, sizeof(buf), "%lu\n", (unsigned long int) getpid());
+ 	    if(lseek(pidfd, 0, SEEK_SET) == -1 ||
+ 	       ftruncate(pidfd, 0) == -1 ||
+ 	       write(pidfd, buf, strlen(buf)) == -1) {
+diff -urNad complete.dpatch/timsieved/actions.c /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c
+--- complete.dpatch/timsieved/actions.c	2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c	2005-11-11 16:17:00.688912460 +0100
+@@ -364,7 +364,8 @@
+ 
+   if (result != TIMSIEVE_OK) {
+       if (errstr && *errstr) { 
+-	  prot_printf(conn, "NO {%d}\r\n%s\r\n", strlen(errstr), errstr);
++	  prot_printf(conn, "NO {%lu}\r\n%s\r\n",
++			  (unsigned long) strlen(errstr), errstr);
+ 	  free(errstr);
+       } else {
+ 	  if (errstr) free(errstr);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/19-fix_tls_ssl.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/19-fix_tls_ssl.dpatch
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19-fix_tls_errormessage.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make TLS/SSL error message more informative
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/tls.c /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c
+--- complete.dpatch/imap/tls.c	2005-11-11 15:31:40.000000000 +0100
++++ /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c	2005-11-11 15:31:41.926478833 +0100
+@@ -166,7 +166,7 @@
+  * tim - this seems to just be giving logging messages
+  */
+ 
+-static void apps_ssl_info_callback(SSL * s, int where, int ret)
++static void apps_ssl_info_callback(const SSL * s, int where, int ret)
+ {
+     char   *str;
+     int     w;
+@@ -679,7 +679,7 @@
+     s_key_file = config_getstring(IMAPOPT_TLS_KEY_FILE);
+ 
+     if (!set_cert_stuff(s_ctx, s_cert_file, s_key_file)) {
+-	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data");
++	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data, may be a cert/key mismatch?");
+ 	return (-1);
+     }
+     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
+@@ -1098,7 +1098,7 @@
+     
+     if (c_cert_file || c_key_file) {
+ 	if (!set_cert_stuff(c_ctx, c_cert_file, c_key_file)) {
+-	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data");
++	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data, may be a cert/key mismatch?");
+ 	    return (-1);
+ 	}
+     }
+diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c	2005-11-11 15:31:41.000000000 +0100
++++ /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c	2005-11-11 15:31:57.244983198 +0100
+@@ -63,6 +63,7 @@
+ 
+ #include <limits.h>
+ #include <unistd.h>
++#include <ctype.h>
+ 
+ #include <netinet/in.h>
+ #include <sys/un.h>
+@@ -418,7 +419,7 @@
+  * tim - this seems to just be giving logging messages
+  */
+ 
+-static void apps_ssl_info_callback(SSL * s, int where, int ret)
++static void apps_ssl_info_callback(const SSL * s, int where, int ret)
+ {
+     char   *str;
+     int     w;
+@@ -531,7 +532,7 @@
+     
+     if (c_cert_file || c_key_file)
+ 	if (!set_cert_stuff(tls_ctx, c_cert_file, c_key_file)) {
+-	    printf("TLS engine: cannot load cert/key data\n");
++	    printf("TLS engine: cannot load cert/key data, maybe a cert/key mismatch?\n");
+ 	    return IMTEST_FAIL;
+ 	}
+     SSL_CTX_set_tmp_rsa_callback(tls_ctx, tmp_rsa_cb);
+diff -urNad complete.dpatch/lib/imclient.c /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c
+--- complete.dpatch/lib/imclient.c	2005-11-11 15:31:40.000000000 +0100
++++ /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c	2005-11-11 15:31:41.928478637 +0100
+@@ -1733,7 +1733,7 @@
+ 
+     if (c_cert_file || c_key_file)
+ 	if (!set_cert_stuff(imclient->tls_ctx, c_cert_file, c_key_file)) {
+-	    printf("[ TLS engine: cannot load cert/key data ]\n");
++	    printf("[ TLS engine: cannot load cert/key data, might be a cert/key mismatch]\n");
+ 	    return -1;
+ 	}
+     SSL_CTX_set_tmp_rsa_callback(imclient->tls_ctx, tmp_rsa_cb);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/20-drac_auth.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/20-drac_auth.dpatch
@@ -0,0 +1,12272 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_drac_auth.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable DRAC (pop-before-smtp) authentication
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in	2006-04-18 20:39:34.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/configure.in	2006-04-18 20:39:35.682096917 +0200
+@@ -974,6 +974,19 @@
+ SNMP_SUBDIRS=""
+ AC_SUBST(SNMP_SUBDIRS)
+ 
++dnl
++dnl Test for DRAC
++dnl
++DRACLIBS=
++AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
++	if test -d "$withval"; then
++		LDFLAGS="$LDFLAGS -L${withval}"
++		AC_CHECK_LIB(drac, dracauth,
++			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
++			DRACLIBS="-ldrac")
++	fi)
++AC_SUBST(DRACLIBS)
++
+ CMU_LIBWRAP
+ CMU_UCDSNMP
+ 
+diff -urNad cyrus-imapd-2.2.13/configure.in.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/configure.in.orig
+--- cyrus-imapd-2.2.13/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/configure.in.orig	2006-04-18 20:39:35.684096723 +0200
+@@ -0,0 +1,1223 @@
++dnl Process this file with autoconf to produce a configure script.
++
++dnl
++dnl Copyright (c) 1998-2005 Carnegie Mellon University.  All rights reserved.
++dnl
++dnl Redistribution and use in source and binary forms, with or without
++dnl modification, are permitted provided that the following conditions
++dnl are met:
++dnl
++dnl 1. Redistributions of source code must retain the above copyright
++dnl    notice, this list of conditions and the following disclaimer. 
++dnl
++dnl 2. Redistributions in binary form must reproduce the above copyright
++dnl    notice, this list of conditions and the following disclaimer in
++dnl    the documentation and/or other materials provided with the
++dnl    distribution.
++dnl
++dnl 3. The name "Carnegie Mellon University" must not be used to
++dnl    endorse or promote products derived from this software without
++dnl    prior written permission. For permission or any other legal
++dnl    details, please contact  
++dnl      Office of Technology Transfer
++dnl      Carnegie Mellon University
++dnl      5000 Forbes Avenue
++dnl      Pittsburgh, PA  15213-3890
++dnl      (412) 268-4387, fax: (412) 268-7395
++dnl      tech-transfer@andrew.cmu.edu
++dnl
++dnl 4. Redistributions of any form whatsoever must retain the following
++dnl    acknowledgment:
++dnl    \"This product includes software developed by Computing Services
++dnl     at Carnegie Mellon University (http://www.cmu.edu/computing/).\"
++dnl
++dnl CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++dnl THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++dnl AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++dnl FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++dnl AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++dnl OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++dnl
++dnl configure.in for the Cyrus imapd
++dnl $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $
++dnl
++
++
++AC_INIT(imap/imapd.c)
++AC_PREREQ([2.54])
++AC_CONFIG_HEADER(config.h)
++AC_CANONICAL_HOST
++
++dnl Useful for maintainer mode stuff
++WARNERROR=-W
++AC_ARG_ENABLE(warnings-are-errors,[  --enable-warnings-are-errors   add -Werror to most gcc calls], [ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ])
++AC_SUBST(WARNERROR)
++
++dnl Useful hook for distributions
++AC_ARG_WITH(extraident,[  --with-extraident=STRING   use STRING as extra version information],
++	[AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", [Extra version information for imap/version.h])])
++
++AC_CHECK_PROG(MAKEDEPEND,makedepend,makedepend,[`cd ${srcdir};pwd`/tools/not-mkdep])
++if test "$MAKEDEPEND" != "makedepend"; then
++        AC_MSG_WARN([Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory.])
++fi
++
++AC_ARG_WITH(login,,AC_ERROR([--with-login is no longer supported.
++Configure SASL appropriately instead.]))
++
++AC_ARG_WITH(cyrus-prefix,[  --with-cyrus-prefix=DIR    use DIR as cyrus server install directory],
++	cyrus_prefix="$withval",cyrus_prefix="/usr/cyrus")
++AC_SUBST(cyrus_prefix)
++AC_DEFINE_UNQUOTED(CYRUS_PATH,"$cyrus_prefix",[Where will we be installed?])
++AC_ARG_WITH(service-path,[  --with-service-path=DIR    use DIR as service install directory],
++	service_path="$withval",service_path="$cyrus_prefix/bin")
++AC_SUBST(service_path)
++AC_DEFINE_UNQUOTED(SERVICE_PATH,"$service_path",[Directiory to use for service binaries])
++AC_ARG_WITH(cyrus-user,[  --with-cyrus-user=USERID   use USERID cyrus userid],
++	cyrus_user="$withval",cyrus_user="cyrus")
++AC_SUBST(cyrus_user)
++AC_DEFINE_UNQUOTED(CYRUS_USER, "$cyrus_user",[What user will we run as?])
++AC_ARG_WITH(cyrus-group,[  --with-cyrus-group=GROUPID use GROUPID cyrus group],
++	cyrus_group="$withval",cyrus_group="mail")
++AC_SUBST(cyrus_group)
++
++dnl allow users to override $sysconfdir, but retain old default (/etc)
++dnl if not specified
++if test $sysconfdir = '${prefix}/etc'; then
++  sysconfdir="/etc"
++fi
++AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
++
++AC_PROG_CC
++AC_PROG_RANLIB
++AC_PROG_MAKE_SET
++AC_PROG_INSTALL
++AC_AIX
++AC_ISC_POSIX
++AC_PROG_AWK
++AC_C_CONST
++dnl fakeroot sometimes fails this test
++dnl and Debian always supports long filenames anyway
++dnl AC_SYS_LONG_FILE_NAMES
++dnl if test $ac_cv_sys_long_file_names = no; then
++dnl	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
++dnl fi
++AC_C_INLINE
++
++CMU_C___ATTRIBUTE__
++CMU_C_FPIC
++
++AC_CHECK_SIZEOF(long)
++
++dnl check for -R, etc. switch
++CMU_GUESS_RUNPATH_SWITCH
++
++AC_CHECK_HEADERS(unistd.h sys/select.h sys/param.h stdarg.h)
++AC_REPLACE_FUNCS(memmove strcasecmp ftruncate strerror)
++AC_CHECK_FUNCS(strlcat strlcpy)
++AC_HEADER_DIRENT
++
++dnl do this before Berkeley DB/IPv6 detection
++CMU_SOCKETS
++LIBS="$LIBS ${LIB_SOCKET}"
++
++dnl check for IPv6 functions (fall back to sasl's if we don't have them)
++cyrus_cv_getaddrinfo=yes
++IPv6_CHECK_FUNC(getaddrinfo, [IPv6_CHECK_FUNC(gai_strerror,
++	AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?]),
++	cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
++
++if test $cyrus_cv_getaddrinfo = no; then
++	IPV6_OBJS="getaddrinfo.o"
++fi
++
++cyrus_cv_getnameinfo=yes
++IPv6_CHECK_FUNC(getnameinfo,
++	AC_DEFINE(HAVE_GETNAMEINFO,[],[Do we have a getnameinfo?]),
++	cyrus_cv_getnameinfo=no)
++
++if test $cyrus_cv_getnameinfo = no; then
++	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++fi
++
++IPv6_CHECK_SS_FAMILY()
++IPv6_CHECK_SA_LEN()
++
++AC_SUBST(IPV6_OBJS)
++
++dnl this is to check for time things
++AC_CHECK_HEADERS(sys/time.h)
++AC_HEADER_TIME
++AC_STRUCT_TM
++AC_STRUCT_TIMEZONE
++
++AC_SUBST(CPPFLAGS)
++AC_SUBST(PRE_SUBDIRS)
++AC_SUBST(EXTRA_SUBDIRS)
++AC_SUBST(DEPLIBS)
++AC_SUBST(LOCALDEFS)
++AC_FUNC_VPRINTF
++
++dnl function for doing each of the database backends
++dnl parameters: backend name, variable to set, withval
++
++CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++
++dnl Berkeley DB Detection
++
++AC_ARG_WITH(bdb, [  --with-bdb=DIR          use Berkeley DB (in DIR) [[yes]] ],
++	with_bdb=$withval, with_bdb="yes")
++
++dnl support old-style
++AC_ARG_WITH(dbdir,, with_bdb=$withval)
++
++case "$with_bdb" in
++  no)
++	use_berkeley="no"
++	;;
++  yes)
++	use_berkeley="yes"
++	with_bdb_lib=none
++	with_bdb_inc=none
++	;;
++  
++  *)
++	use_berkeley="yes"
++	with_bdb_lib="$with_bdb/lib"
++	with_bdb_inc="$with_bdb/include"
++	;;
++esac
++
++if test "$use_berkeley" != "no"; then
++  CYRUS_BERKELEY_DB_CHK()
++
++  if test "$dblib" = "no"; then
++    AC_ERROR([Berkeley DB 3.x or later was not found.  You may need to 
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options.])
++  fi
++
++  if test "$with_bdb_lib" != "none"; then
++    CMU_ADD_LIBPATH($with_bdb_lib)
++  fi
++
++  BDB_INC=${BDB_INCADD}
++  BDB_LIB=${BDB_LIBADD}
++  AC_SUBST(BDB_INC)
++  AC_SUBST(BDB_LIB)
++
++  LIBS="${LIBS} ${BDB_LIBADD}"
++  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
++
++  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
++  AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
++fi
++
++dnl End Berkeley DB Detection
++
++AC_SUBST(CYRUSDB_OBJS)
++
++SIEVE_SUBDIRS=""
++sievedir="sieve"
++AC_ARG_ENABLE(sieve,
++        [  --disable-sieve         disable Sieve support],
++	if test "$enableval" = no; then
++ 		sievedir="no"
++	fi)
++
++if test "$sievedir" != "no"; then
++	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
++	AC_SUBST(SIEVE_OBJS)
++	SIEVE_LIBS="../${sievedir}/libsieve.a"
++	AC_SUBST(SIEVE_LIBS)
++	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
++	AC_SUBST(SIEVE_CPPFLAGS)
++	AC_DEFINE(USE_SIEVE,[],[Build in Sieve support?])
++
++	dnl Sieve configure stuff
++	AC_PROG_YACC
++	AC_PROG_LEX
++	AC_CHECK_LIB(fl,main)
++
++ 	AC_SEARCH_LIBS(regcomp, rx regex, [
++ 			AC_DEFINE(ENABLE_REGEX,[],[Do we have a decent regex library?])
++		 	AC_CHECK_HEADER(rxposix.h, AC_DEFINE(HAVE_RX,[],[Do we have rxposix.h?]))])
++  		
++
++	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
++fi
++
++AC_SUBST(SIEVE_SUBDIRS)
++
++dnl for et routines
++AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR,[],[Do we have strerror()?]),
++              AC_DEFINE(NEED_SYS_ERRLIST,[],[Do we have a sys_errlist?]))
++
++dnl for master fd limits
++AC_CHECK_HEADERS(sys/resource.h)
++AC_CHECK_FUNCS(setrlimit)
++AC_CHECK_FUNCS(getrlimit)
++
++dnl for detaching terminal
++AC_CHECK_FUNCS(daemon setsid)
++
++dnl for turning off sockets
++AC_CHECK_FUNCS(shutdown)
++
++AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_DEFINE(HAVE_SOCKLEN_T,[],[Do we have a socklen_t?]))
++AC_EGREP_HEADER(sockaddr_storage, sys/socket.h,
++		AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE,[],[Do we have a sockaddr_storage?]))
++AC_EGREP_HEADER(rlim_t, sys/resource.h, AC_DEFINE(HAVE_RLIM_T,[],[Do we have an rlim_t?]))
++
++dnl Bunch of setproctitle stuff
++spt_type=""
++AC_CHECK_FUNC(setproctitle,spt_type=SPT_BUILTIN)
++if test "$spt_type" = ""; then
++	dnl BSD/OS and FreeBSD put it in -lutil
++	AC_CHECK_LIB(util,setproctitle,spt_type=SPT_BUILTIN
++			LIBS="${LIBS} -lutil")
++fi
++if test "$spt_type" = ""; then
++	AC_CHECK_HEADER(sys/pstat.h,spt_type=SPT_PSTAT)
++fi
++if test "$spt_type" = ""; then
++	AC_CHECK_HEADER(sys/sysnews.h,spt_type=SPT_SYSMIPS)
++fi
++if test "$spt_type" = ""; then
++	AC_MSG_CHECKING(for PS_STRINGS)
++	AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_TRY_CPP([
++#include <machine/vmparam.h>
++#include <sys/exec.h>
++#ifndef PS_STRINGS
++#include </nonexistent>
++#endif],cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
++	if test $cyrus_cv_sys_psstrings = yes; then
++		spt_type=SPT_PSSTRINGS
++	fi
++	AC_MSG_RESULT($cyrus_cv_sys_psstrings)
++fi
++if test "$spt_type" = ""; then
++	AC_MSG_CHECKING(for SCO)
++	AC_CACHE_VAL(cyrus_cv_sys_sco, AC_TRY_CPP([
++#ifndef _SCO_unix_
++#include </nonexistent>
++#endif],cyrus_cv_sys_sco=yes,cyrus_cv_sys_sco=no))
++	if test $cyrus_cv_sys_sco = yes; then
++		spt_type=SPT_SCO
++	fi
++	AC_MSG_RESULT($cyrus_cv_sys_sco)
++fi
++if test "$spt_type" = ""; then
++	AC_MSG_CHECKING(for setproctitle usability)
++	AC_CACHE_VAL(cyrus_cv_sys_setproctitle, AC_TRY_CPP([
++#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
++#include </nonexistent>
++#endif],cyrus_cv_sys_setproctitle=yes,cyrus_cv_sys_setproctitle=no))
++	if test $cyrus_cv_sys_setproctitle = no; then
++		spt_type=SPT_NONE
++	fi
++	AC_MSG_RESULT($cyrus_cv_sys_setproctitle)
++fi
++if test "$spt_type" != ""; then
++	AC_DEFINE_UNQUOTED(SPT_TYPE,$spt_type,[Do we already have setproctitle?])
++fi
++
++AC_MSG_CHECKING(nonblocking method)
++AC_CACHE_VAL(cyrus_cv_sys_nonblock,AC_TRY_LINK([#include <sys/types.h>
++#include <sys/file.h>
++#include <fcntl.h>
++#ifndef	FNDELAY
++#define FNDELAY		O_NDELAY
++#endif],[fcntl(0, F_GETFL, 0)&FNDELAY],
++cyrus_cv_sys_nonblock=fcntl,cyrus_cv_sys_nonblock=ioctl))
++WITH_NONBLOCK=$cyrus_cv_sys_nonblock
++AC_SUBST(WITH_NONBLOCK)
++AC_MSG_RESULT($WITH_NONBLOCK)
++
++AC_MSG_CHECKING(timezone GMT offset method)
++AC_CACHE_VAL(cyrus_cv_struct_sys_gmtoff,AC_TRY_COMPILE([
++#include <time.h>],[struct tm tm;
++tm.tm_gmtoff = 0;
++],cyrus_cv_struct_sys_gmtoff=tm,cyrus_cv_struct_sys_gmtoff=gmtime))
++WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
++AC_SUBST(WITH_GMTOFF)
++AC_MSG_RESULT($WITH_GMTOFF)
++AC_MSG_CHECKING(for shared mmap)
++AC_CACHE_VAL(cyrus_cv_func_mmap_shared,AC_TRY_RUN([
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base+4, "test", 4) != 0) exit(1);
++exit(0);}
++],cyrus_cv_func_mmap_shared=yes,cyrus_cv_func_mmap_shared=no,
++cyrus_cv_func_mmap_shared=no))
++AC_MSG_RESULT($cyrus_cv_func_mmap_shared)
++if test $cyrus_cv_func_mmap_shared = yes; then
++	WITH_MAP="shared"
++else
++AC_MSG_CHECKING(for stupid shared mmap)
++AC_CACHE_VAL(cyrus_cv_func_mmap_stupidshared,AC_TRY_RUN([
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++lseek(fd, 0L, 0);	
++if (write(fd, "xyzz", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base, "xyzz", 4) != 0) exit(1);
++exit(0);}
++],cyrus_cv_func_mmap_stupidshared=yes,cyrus_cv_func_mmap_stupidshared=no,
++cyrus_cv_func_mmap_stupidshared=no))
++AC_MSG_RESULT($cyrus_cv_func_mmap_stupidshared)
++if test $cyrus_cv_func_mmap_stupidshared = yes; then
++	WITH_MAP="stupidshared"
++else
++	AC_MSG_WARN([*** This system does not have a working mmap()])
++	AC_MSG_WARN(*** Expect a considerable performance penalty)
++	WITH_MAP=nommap
++fi
++fi
++
++AC_SUBST(WITH_MAP)
++AC_ARG_WITH(lock,
++  [  --with-lock=METHOD      force use of METHOD for locking (flock or fcntl)],
++  WITH_LOCK="$withval", [
++  AC_CHECK_FUNC(fcntl,WITH_LOCK="fcntl",[
++		AC_CHECK_FUNC(flock,WITH_LOCK="flock",[
++				AC_ERROR(unable to detect locking method)
++			      ])
++		])
++  ])
++
++AC_SUBST(WITH_LOCK)
++
++dnl check for fdatasync (used by cyrusdb_skiplist)
++LIB_RT=""
++AC_CHECK_FUNC(fdatasync, AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?]), [
++  AC_CHECK_LIB(rt, fdatasync, [
++	LIB_RT="-lrt"
++	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
++  ])
++])
++
++dnl for makedepend and AFS.
++cant_find_sigvec=no
++AC_CACHE_VAL(cyrus_sigveclib,[
++ dnl bsd classic flavor
++ AC_CHECK_FUNC(sigvec, [
++	cyrus_sigveclib=""
++  ], [
++  dnl hp flavor
++  AC_CHECK_LIB(BSD, sigvec, cyrus_sigveclib="-lBSD", [
++    dnl not hp flavor
++    SAVE_LDFLAGS="$LDFLAGS"
++    dnl solaris flavor
++    LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
++    AC_CHECK_LIB(ucb, sigvec, [
++      dnl more solaris flavor
++      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
++      [ cant_find_sigvec=yes ])
++    LDFLAGS="$SAVE_LDFLAGS"])
++  ])
++])
++AC_SUBST(cyrus_sigveclib)
++
++# ok, we still look for this stuff because of checking groups, but
++# all authentication goes through SASL
++
++AC_ARG_WITH(afs,[  --with-afs=PATH         use AFS libraries from PATH],
++	with_afs="${withval}", with_afs="no")
++
++AC_ARG_WITH(ldap, [  --with-ldap=DIR         use LDAP (in DIR) (experimental) [/usr/local] ],
++	with_ldap="${withval}", with_ldap="no")
++
++dnl select mode of afspts
++AC_ARG_ENABLE(krb5afspts,[  --enable-krb5afspts     compile afskrb PTS module with krb5 support],
++	[SASL_SET_GSSAPI_LIBS
++         AC_DEFINE(AFSPTS_USE_KRB5,[],[Should the AFS PTS plugin use krb5?])])
++
++if test "x$with_afs" != "xno"; then
++    if test ! -d $with_afs; then
++        $with_afs=/usr/local
++    fi
++    CFLAGS="${CFLAGS} -I${with_afs}/include"
++    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
++    if test -f ${with_afs}/lib/afs/libaudit.a; then
++    AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
++    fi
++    if test -f /usr/ucblib/libucb.a; then
++    CMU_ADD_LIBPATH_TO(/usr/ucblib, AFS_LDFLAGS)
++    AFS_LIBS="$AFS_LIBS -lc -lucb"
++    fi
++
++    AC_CACHE_VAL(cyrus_afs_sigvec,[
++        SAVE_LIBS="$LIBS"
++        LIBS="${with_afs}/lib/liblwp.a"
++        AC_MSG_CHECKING(if AFS libraries need sigvec)
++        dnl Does AFS need sigvec?  We have to link against lwp and see
++        dnl if IOMGR_Initialize wants it
++        AC_TRY_LINK([IOMGR_Initialize();],
++                [IOMGR_Initialize()],
++                [
++                        dnl it linked; don't need it
++                        AC_MSG_RESULT(no)
++                        cyrus_afs_sigvec="no"
++                ], [
++                        dnl didn't link; pick up sigvec
++                        AC_MSG_RESULT(yes)
++                        cyrus_afs_sigvec="yes"
++                ])
++        ])
++    if test "$cyrus_afs_sigvec" = yes; then
++      if test "$cant_find_sigvec" = yes; then
++        AC_MSG_WARN([Can't find a sigvec for AFS libraries which seem to need one.])
++      else
++        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
++        AC_SUBST(AFS_LIBS)
++        AC_SUBST(AFS_LDFLAGS)
++        AC_DEFINE(HAVE_AFSKRB,[],[Should we build afskrb pts module?])
++      fi
++    else
++      AFS_LIBS="${AFS_LIBS}"
++      AC_SUBST(AFS_LIBS)
++      AC_SUBST(AFS_LDFLAGS)
++      AC_DEFINE(HAVE_AFSKRB,[],[Should we build afskrb pts module?])
++    fi
++    LIBS="$SAVE_LIBS"
++fi
++
++LDAP_CPPFLAGS=""
++LDAP_LDFLAGS=""
++LDAP_LIBS=""
++
++if test "x$with_ldap" != "xno"; then
++    if test ! -d $with_ldap; then
++        $with_ldap=/usr/local
++    fi
++
++    LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
++    LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
++    LDAP_LIBS=""
++
++    save_CPPFLAGS=$CPPFLAGS
++    save_LDFLAGS=$LDFLAGS
++    CPPFLAGS=$LDAP_CPPFLAGS
++    LDFLAGS=$LDAP_LDFLAGS
++
++    AC_CHECK_LIB(ldap, ldap_initialize, 
++        [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
++          AC_SUBST(LDAP_CPPFLAGS)
++          AC_SUBST(LDAP_LDFLAGS)
++          AC_SUBST(LDAP_LIBS)	
++          LDAP_LIBS="-lldap -llber" ],,-llber)
++
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++fi
++
++if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
++fi
++
++SERVER_SUBDIRS="master imap"
++AC_ARG_ENABLE(server,
++	[  --disable-server        disable compiling servers],
++	if test "$enableval" = no; then
++        	SERVER_SUBDIRS=""
++	fi)
++AC_SUBST(SERVER_SUBDIRS)
++# We always output a server makefile (just because we can)
++
++dnl this is the new simple check for kerberos; since the person had to
++dnl compile SASL, we might as well use the same checks.
++AC_ARG_WITH(krb,[  --with-krb=PATH         use Kerberos from PATH],
++	with_krb="$withval", with_krb="no")
++
++AC_ARG_WITH(krbimpl,[  --with-krbimpl=\[kth|mit\]         assume Kerberos 4 from KTH or MIT],
++	with_krbimpl="$withval", with_krbimpl="kth")
++
++AC_ARG_ENABLE(statickrb,
++		[  --enable-statickrb      link Kerberos statically],
++	with_statickrb="yes", with_statickrb="no")
++
++dnl In order to compile kerberos4, we need libkrb and libdes.
++
++dnl we might need -lresolv for kerberos
++AC_CHECK_LIB(resolv,res_search)
++
++if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
++      AC_MSG_ERROR([--enable-statickrb specified but --with-krb did not specify a valid directory])
++fi 
++
++if test "$with_krb" != "no"; then
++dnl Do we need DES for kerberos?
++AC_ARG_WITH(krbdes,[  --with-krbdes           use Kerberos DES implementation [[yes]]],
++      with_krbdes="$withval", with_krbdes="yes")
++if test "$with_krbdes" = "yes"; then
++  AC_CHECK_LIB(des,des_ecb_encrypt,
++      if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$with_krb/lib/libdes.a"
++      else
++          KRB_LIBS="-ldes"
++      fi,
++  AC_MSG_ERROR([The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix.]))
++fi
++fi
++
++dnl if we were ambitious, we'd look more aggressively for the
++dnl krb4 install
++if test -d ${with_krb}; then
++   AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
++     for krbhloc in include/kerberosIV include
++     do
++       if test -f ${with_krb}/${krbhloc}/krb.h ; then
++         cyrus_krbinclude=${with_krb}/${krbhloc}
++         break
++       fi
++     done
++     ])
++
++   if test -n "${cyrus_krbinclude}"; then
++     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
++   fi
++   CMU_ADD_LIBPATH(${with_krb}/lib)
++fi
++
++if test "$with_krbimpl" != "kth"; then
++  KRBLIB="krb4"
++else
++  KRBLIB="krb"
++fi
++
++if test "$with_des" != no; then
++  AC_CHECK_HEADER(krb.h,
++    AC_CHECK_LIB(${KRBLIB}, krb_mk_priv,
++      if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
++      else
++          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
++      fi,
++                 AC_WARN(No Kerberos V4 found); krb4=no,
++      	   $KRB_LIBS),
++    AC_WARN(No Kerberos V4 found); krb4=no)
++else
++  AC_WARN(No DES library found for Kerberos V4 support)
++  krb4=no
++fi
++
++if test "${krb4}" != no; then
++  AC_DEFINE(HAVE_KRB,[],[Support for Kerberos?])
++fi
++
++LIBS="$KRB_LIBS $LIBS"
++
++SASL_SET_GSSAPI_LIBS
++
++dnl
++dnl Test for OpenSSL
++dnl
++IMAP_PROGS=""
++AC_ARG_WITH(openssl,[  --with-openssl=PATH     use OpenSSL from PATH],
++	with_openssl="${withval}")
++
++OPENSSL_INC=
++OPENSSL_LIB=
++case "$with_openssl" in
++	no) with_openssl="no";;
++	""|yes) 
++	  dnl if openssl has been compiled with the rsaref2 libraries,
++	  dnl we need to include the rsaref libraries in the crypto check
++                LIB_RSAREF=""
++	        AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
++		       LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
++		       cmu_have_rsaref=no)
++
++		with_openssl="yes"
++		AC_CHECK_LIB(crypto,BIO_accept,
++                                    LIBS="-lcrypto $LIB_RSAREF ${LIBS}",
++		                    with_openssl="no", $LIB_RSAREF)
++		AC_CHECK_LIB(ssl, SSL_CTX_new, LIBS="-lssl ${LIBS}",
++		             with_openssl="no", -lcrypto $LIB_RSAREF)
++		
++		;;
++	*)  OPENSSL_INC="-I${with_openssl}/include"
++	    OPENSSL_LIBPATH="${with_openssl}/lib"
++	    OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
++	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
++	    CMU_ADD_LIBPATH(${OPENSSL_LIBPATH})
++	    CMU_ADD_LIBPATH_TO(${OPENSSL_LIBPATH}, OPENSSL_LIB)
++	    LIBS="${LIBS} -lssl -lcrypto";;
++esac
++
++AC_MSG_CHECKING(for openssl)
++AC_MSG_RESULT($with_openssl)
++
++if test "$with_openssl" != "no"; then
++	AC_DEFINE(HAVE_SSL,[],[Build with SSL support?])
++	IMAP_PROGS="$IMAP_PROGS tls_prune"
++        if test "${krb4}" != no; then
++           AC_DEFINE(OPENSSL_ENABLE_OLD_DES_SUPPORT,[],[Configure OpenSSL to provide legacy des apis])
++           AC_DEFINE(OPENSSL_DES_LIBDES_COMPATIBILITY,[],[Configure OpenSSL to provide krb4-compatible legacy des apis])
++        fi
++fi
++AC_SUBST(OPENSSL_INC)
++AC_SUBST(OPENSSL_LIB)
++
++dnl
++dnl Allow for setting EGD socket file on systems without /dev/*random.
++dnl
++AC_ARG_WITH(egd-socket,
++      [  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
++                          for systems without /dev/urandom],
++              [ EGD_SOCKET="$withval" ]
++      )
++if test -n "$EGD_SOCKET" ; then
++      AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET", [Alternative to /dev/urandom?])
++fi
++
++dnl
++dnl Test for Zephyr
++dnl
++AC_ARG_WITH(zephyr,[  --with-zephyr[=PATH]    enable Zephyr notification (installed on PATH)],
++	with_zephyr="${withval}")
++if test -z "$with_zephyr"; then
++     if test -f /usr/local/lib/libzephyr.a; then
++	with_zephyr="/usr/local"
++     elif test -f /usr/lib/libzephyr.a; then
++        with_zephyr="/usr"
++     fi
++fi
++ZEPHYR_LIBS=""
++ZEPHYR_CPPFLAGS=""
++case "$with_zephyr" in
++	no) true;;
++	""|yes) AC_CHECK_LIB(zephyr,ZInitialize,ZEPHYR_LIBS="-lzephyr",
++		with_zephyr="no",);;
++       *)  if test -d ${with_zephyr}/include/zephyr; then
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
++           else
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
++           fi
++           ZEPHYR_LIBS="-lzephyr";;
++esac
++AC_SUBST(ZEPHYR_LIBS)
++AC_SUBST(ZEPHYR_CPPFLAGS)
++if test "$with_zephyr" != "no"; then
++	AC_DEFINE(HAVE_ZEPHYR,[],[Build with Zephyr support?])
++fi
++
++dnl
++dnl Set pidfile location
++dnl
++AC_ARG_WITH(pidfile,[  --with-pidfile[=PATH]   pidfile in PATH (/var/run/cyrus-master.pid)],
++	[MASTERPIDFILE="$withval"],
++	[MASTERPIDFILE="/var/run/cyrus-master.pid"])
++MASTERPIDFILE="\"$MASTERPIDFILE\""
++AC_DEFINE_UNQUOTED(MASTER_PIDFILE, $MASTERPIDFILE,[Name of the pidfile for master])
++
++dnl
++dnl Select a method for IMAP IDLE
++dnl
++AC_ARG_WITH(idle,[  --with-idle=METHOD      use METHOD for IMAP IDLE
++                          METHOD is [poll], idled or no],
++	WITH_IDLE="${withval}",WITH_IDLE="poll")
++AC_SUBST(WITH_IDLE)
++if test "$WITH_IDLE" = "idled"; then
++  IMAP_PROGS="$IMAP_PROGS idled"
++fi
++
++dnl
++dnl see if we're compiling with NNTP support
++dnl
++ENABLE_NNTP=no
++AC_ARG_ENABLE(nntp,
++        [  --enable-nntp           enable NNTP support (experimental)],
++	ENABLE_NNTP=$enableval
++        if test "$ENABLE_NNTP" != no; then
++	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
++        fi) 
++
++dnl
++dnl see if we're compiling the Murder support programs
++dnl
++AC_ARG_ENABLE(murder,
++        [  --enable-murder         enable IMAP Murder support],
++        if test "$enableval" != no; then
++	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
++        fi) 
++
++AC_SUBST(IMAP_PROGS)
++
++dnl
++dnl Try and find a system version of com_err.
++dnl If we see something that looks a little wacky, ignore it (there are many
++dnl deficient installs of com_err, unfortunately, which leave out compile_et)
++dnl
++AC_ARG_WITH(com_err,
++[  --with-com_err=PATH     use com_err from path -- includes in PATH/include,
++                          libs in PATH/lib, and compile_et in PATH/bin])
++if test -z "$with_com_err"; then
++	# no value supplied
++	AC_CHECK_LIB(com_err, com_err, [
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		AC_CHECK_HEADER(et/com_err.h,
++		  [AC_DEFINE(HAVE_ET_COM_ERR_H,[],[We need et/com_err.h])],
++		  [AC_CHECK_HEADER(com_err.h,[],[AC_ERROR([cannot locate com_err.h])])])
++		AC_PATH_PROG(COMPILE_ET, compile_et, [no compile et])
++	], [
++	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
++		with_com_err="/usr/local"
++		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, [no compile et])
++	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
++		with_com_err="/usr"
++		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, [no compile et])
++	else
++		# use ours
++		with_com_err=yes
++	fi
++	])
++
++	if test "${with_com_err}" = "no"; then
++	  AC_MSG_WARN([com_err is required; included version will be used.])
++	  with_com_err="yes"
++	fi
++	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
++	  AC_MSG_WARN([Parts of com_err distribuion were found, but not compile_et.])
++	  AC_MSG_WARN([Will build com_err from included sources.])
++	  with_com_err="yes" # build it ourselves
++	fi
++fi
++
++case "$with_com_err" in
++  # built-in et
++  yes) # use the com_err we're gonna build
++	  COM_ERR_LIBS="../et/libcom_err.a"
++	  COMPILE_ET="../et/compile_et"
++	  COM_ERR_LDFLAGS=""
++	  COM_ERR_CPPFLAGS="-I\${top_srcdir}/et"
++	  PRE_SUBDIRS="et ${PRE_SUBDIRS}"
++	  EXTRA_OUTPUT="${EXTRA_OUTPUT} et/Makefile"
++	  ;;
++  "")   # no problem, we already have it in the paths
++	# we do nothing to pick it up
++	COM_ERR_LIBS="-lcom_err" # hope it's not shared
++	# we already set COMPILE_ET, or we didn't get here
++	COM_ERR_LDFLAGS=""
++	COM_ERR_CPPFLAGS=""
++      ;;
++  *) # use whatever they told us, or whatever we found
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
++     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
++     # Ever get the feeling people hide this stuff on purpose?
++     if test -d "${with_com_err}/include/et" ; then
++       COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
++     fi
++dnl     CMU_ADD_LIBPATH_TO(${with_com_err}/lib, COM_ERR_LDFLAGS)
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++esac
++AC_SUBST(COMPILE_ET)
++AC_SUBST(COM_ERR_LIBS)
++AC_SUBST(COM_ERR_LDFLAGS)
++AC_SUBST(COM_ERR_CPPFLAGS)
++
++AC_MSG_CHECKING(for modern syslog)
++AC_CACHE_VAL(cyrus_cv_lib_syslog, AC_TRY_CPP([#include <syslog.h>
++#ifndef LOG_LOCAL6
++#include </nonexistent>
++#endif],cyrus_cv_lib_syslog=yes,cyrus_cv_lib_syslog=no))
++if test $cyrus_cv_lib_syslog = no; then
++	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
++	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
++	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
++fi
++AC_MSG_RESULT($cyrus_cv_lib_syslog)
++
++AC_MSG_CHECKING(which syslog facility to use)
++SYSLOG_FACILITY=LOG_LOCAL6
++AC_ARG_WITH(syslogfacility,[  --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)],
++               [ if test "$withval" != "yes" -a "$withval" != "no" ; then
++                       SYSLOG_FACILITY=LOG_$withval
++               fi; ])
++AC_DEFINE_UNQUOTED(SYSLOG_FACILITY, $SYSLOG_FACILITY, [Syslog facility to use.])
++AC_MSG_RESULT($SYSLOG_FACILITY)
++
++dnl Have to check getdtabalesize after adding ossup, as some ossups define it
++AC_REPLACE_FUNCS(getdtablesize)
++AC_ARG_ENABLE(cmulocal,
++	[  --enable-cmulocal       enable CMU-specific local support],
++	if test "$enableval" = yes; then
++		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
++		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
++	fi)
++
++AC_MSG_CHECKING(to use old sieve service name)
++AC_ARG_ENABLE(oldsievename,
++	[  --enable-oldsievename   enable the use of 'imap' as the sieve service name],
++	if test "$enableval" = yes; then
++		AC_MSG_RESULT(yes)
++		AC_DEFINE(OLD_SIEVE_SERVICE_NAME,[],[Use "imap" as sieve service name?])
++	else
++		AC_MSG_RESULT(no)
++	fi,
++	AC_MSG_RESULT(no))
++
++AC_ARG_ENABLE(listext,
++	[  --enable-listext        enable IMAP List extensions],
++	if test "$enableval" = yes; then
++		AC_DEFINE(ENABLE_LISTEXT,[],[Enable the LISTEXT extension?])
++	fi)
++
++AC_ARG_ENABLE(netscapehack,
++	[  --enable-netscapehack   enable Netscape hack for the menu option
++                          in Communicator to Administrate Mail],
++	if test "$enableval" = yes; then
++		AC_DEFINE(ENABLE_X_NETSCAPE_HACK,[],[Enable Netscape Menu Option Hack?])
++	fi)
++
++AC_CHECK_FUNC(dlopen,,[AC_CHECK_LIB(dl, dlopen)])
++CMU_SASL2_REQUIRE_VER(2,1,7)
++CMU_SASL2_CHECKAPOP_REQUIRED
++
++AC_ARG_WITH(perl,       [  --with-perl=PERL        use PERL for perl],
++	with_perl="$withval", with_perl="perl")
++
++if test "${with_perl}" = yes; then
++    with_perl="perl"
++fi
++if test "${with_perl}" != no; then
++    if test ${using_static_sasl} = "staticonly"; then
++	AC_MSG_WARN([Cannot compile perl utilities using static libsasl])
++	with_perl="no"
++    else 
++	AC_CHECK_PROGS(PERL, ${with_perl} perl, with_perl=notfound)
++    fi
++fi
++if test "$with_perl" = "notfound"; then
++    AC_MSG_WARN(Perl not found: Administrative tools won't be available)
++elif test "${with_perl}" != "no"; then
++dnl compile perl stuff
++    EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
++dnl and compile perl/cyradm
++    PERL_SUBDIRS="imap"
++    PERL="${with_perl}"
++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`
++    PERL_CCCDLFLAGS="$cccdlflags"
++    AC_SUBST(PERL_CCCDLFLAGS)
++fi
++
++dnl for timsieved
++if test "$sievedir" != "no"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
++
++	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
++	PERL_DEPSUBDIRS="sieve"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
++else
++	PERL_DEPSUBDIRS="none"
++fi
++
++dnl Check for MD5 functions
++AC_FUNC_CHECK(MD5Init,,
++       AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
++                    MD5OBJ="md5.o"))
++AC_SUBST(MD5OBJ)
++
++dnl snmp
++dnl (agentx was depricated, but SNMP_SUBDIRS is conveinent as a placeholder)
++SNMP_SUBDIRS=""
++AC_SUBST(SNMP_SUBDIRS)
++
++CMU_LIBWRAP
++CMU_UCDSNMP
++
++# Figure out what directories we're linking against.
++# Lots of fun for the whole family.
++# This probably chokes on anything with spaces in it.
++# All we want is the list of -L directories, and -L may or may not be
++# followed by a space.
++isdir=no
++libpath=""
++#echo "debug ldflags: << ${ldflags} >>"
++#echo "debug default_ldflags: << ${default_ldflags} >>"
++for flag in ${ldflags} ${default_ldflags}; do
++  case $flag in
++    -L)
++      # it's a split -L option, we'll mark the next option as a dir.
++      isdir=yes
++      ;;
++
++    -L*) 
++      # attached -L option: split off the directory
++      larg=`echo $flag | sed -e 's:-L\(..*\):\1:'`
++      libpath="${libpath} ${larg}"
++      ;;
++
++    *)
++      if test $isdir = yes ; then
++	libpath="${libpath} ${flag}"
++	isdir=no
++      fi
++  esac
++done
++
++IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
++IMAP_LIBS="${LIB_SASL} ${LIBS}"
++
++AC_SUBST(LIB_RT)
++AC_SUBST(IMAP_COM_ERR_LIBS)
++AC_SUBST(IMAP_LIBS)
++
++dnl AC_OUTPUT_COMMANDS([
++dnl   if test "$with_perl" != "no"; then
++dnl     (cd perl/sieve/managesieve; $perl Makefile.PL PREFIX=$prefix)
++dnl     (cd perl/imap; $perl Makefile.PL PREFIX=$prefix)
++dnl   fi
++dnl ], perl=$PERL; with_perl=$with_perl; prefix=$prefix; SASL_LIB="$LIB_SASL"; SASL_INC="$SASLFLAGS"; export SASL_LIB SASL_INC)
++AC_SUBST(PERL_SUBDIRS)
++AC_SUBST(PERL_DEPSUBDIRS)
++AC_SUBST(PERL)
++
++AH_TOP([
++/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef _CYRUS_IMAPD_CONFIG_H_
++#define _CYRUS_IMAPD_CONFIG_H_
++])
++
++AH_BOTTOM([
++/* time.h */
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++/* com_err.h, as needed */
++#ifndef IN_COM_ERR
++#ifdef HAVE_ET_COM_ERR_H
++#include <et/com_err.h>
++#else
++#include <com_err.h>
++#endif /* HAVE_ET_COM_ERR_H */
++#endif /* IN_COM_ERR */
++
++/* This allows us to work even when we don't have an fdatasync */
++#ifndef HAVE_FDATASYNC
++#define fdatasync(fd) fsync(fd)
++#endif
++
++/* A similar setup for not having O_DSYNC */
++#include <fcntl.h>
++
++#ifndef O_DSYNC
++#  ifdef O_SYNC
++#    define O_DSYNC     O_SYNC          /* POSIX */
++#  else
++#    define O_DSYNC     O_FSYNC         /* BSD */
++#  endif
++#endif
++
++#ifndef HAVE___ATTRIBUTE__
++/* Can't use attributes... */
++#define __attribute__(foo)
++#endif
++
++#ifndef HAVE_SOCKLEN_T
++typedef unsigned int socklen_t;
++#endif
++
++#ifndef HAVE_RLIM_T
++typedef int rlim_t;
++#endif
++
++/* some potentially memory saving tradeoffs, 
++   preconfigured in memory-saving mode */
++
++/* save the cmdlines for the ID command */
++#undef ID_SAVE_CMDLINE
++
++/* IPv6 things */
++#include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
++#define	_SS_MAXSIZE	128	/* Implementation specific max size */
++#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
++
++struct sockaddr_storage {
++	struct	sockaddr ss_sa;
++	char		__ss_pad2[_SS_PADSIZE];
++};
++# define ss_family ss_sa.sa_family
++# define HAVE_SS_FAMILY
++#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
++
++#ifndef HAVE_SS_FAMILY
++#define ss_family	__ss_family
++#endif
++
++#ifndef AF_INET6
++/* Define it to something that should never appear */
++#define	AF_INET6	AF_MAX
++#endif
++
++#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
++#include "gai.h"
++#endif
++
++/* End IPv6 things */
++
++#ifdef OLD_SIEVE_SERVICE_NAME
++#define SIEVE_SERVICE_NAME "imap"
++#else
++#define SIEVE_SERVICE_NAME "sieve"
++#endif
++
++/* filenames */
++#define FNAME_DBDIR "/db"
++#define FNAME_USERDIR "/user/"
++#define FNAME_DOMAINDIR "/domain/"
++#define FNAME_LOGDIR "/log/"
++#define FNAME_PTSDB "/ptclient/ptscache.db"
++#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
++#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
++
++#ifndef HAVE_SHUTDOWN
++#define shutdown(fd, mode) 0
++#endif
++
++/* compile time options; think carefully before modifying */
++enum {
++    /* should we send an UNAVAILABLE message to master when
++     * a service is exiting (master is already going to be 
++     * informed of the exit by the SIGCHLD signal anyway) ? */
++    MESSAGE_MASTER_ON_EXIT = 0,
++
++    /* should a hierarchical rename stop on error? */
++    RENAME_STOP_ON_ERROR = 1,
++
++    /* should we call fsync() to maybe help with softupdates? (it should) */
++    APPEND_ULTRA_PARANOID = 1,
++
++    /* should we log extra information at the DEBUG level for DB stuff? 
++     * 0 -> nothing; 1 -> some; higher -> even more */
++    CONFIG_DB_VERBOSE = 1,
++
++    /* log timing information to LOG_DEBUG */
++    CONFIG_TIMING_VERBOSE = 0,
++
++    /* should we be pedantic about namespace or sleezy? */
++    SLEEZY_NAMESPACE = 1,
++
++    /* should we do a fast TLS session shutdown? */
++    TLS_FAST_SHUTDOWN = 1,
++
++    /* should we use the SQUAT engine to accelerate SEARCH? */
++    SQUAT_ENGINE = 1,
++
++    /* should we have long LMTP error messages? */
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
++};
++
++#endif /* _CYRUS_IMAPD_CONFIG_H_ */
++])
++
++dnl make sure that Makefile is the last thing output
++AC_OUTPUT(man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile)
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/Makefile.in
+--- cyrus-imapd-2.2.13/imap/Makefile.in	2006-04-18 20:39:34.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/Makefile.in	2006-04-18 20:39:35.685096625 +0200
+@@ -69,6 +69,7 @@
+ SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
++DRAC_LIBS = @DRACLIBS@
+ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ 
+@@ -217,17 +218,17 @@
+ imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(CC) $(LDFLAGS) -o imapd \
+ 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
+-	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+ 
+ imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
+ 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+ 
+ imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
+ 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
+ 
+ proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(CC) $(LDFLAGS) -o proxyd \
+@@ -254,7 +255,7 @@
+ 
+ pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
+-	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+ 
+ nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
+ 	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/Makefile.in.orig
+--- cyrus-imapd-2.2.13/imap/Makefile.in.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/Makefile.in.orig	2006-04-18 20:39:35.686096528 +0200
+@@ -0,0 +1,354 @@
++# Makefile for cyrus imap server and associated programs
++# $Id: Makefile.in,v 1.184 2004/05/28 18:03:02 rjs3 Exp $
++# 
++# @configure_input@
++# 
++# Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer. 
++#
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in
++#    the documentation and/or other materials provided with the
++#    distribution.
++#
++# 3. The name "Carnegie Mellon University" must not be used to
++#    endorse or promote products derived from this software without
++#    prior written permission. For permission or any other legal
++#    details, please contact  
++#      Office of Technology Transfer
++#      Carnegie Mellon University
++#      5000 Forbes Avenue
++#      Pittsburgh, PA  15213-3890
++#      (412) 268-4387, fax: (412) 268-7395
++#      tech-transfer@andrew.cmu.edu
++#
++# 4. Redistributions of any form whatsoever must retain the following
++#    acknowledgment:
++#    "This product includes software developed by Computing Services
++#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++#
++# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++# 
++DEFINES=-DSETPROCTITLE
++
++# \Seen state database.  Either 'db' (berkeley db) or 
++# 'local' (legacy flat file).
++SEEN=seen_db.o
++
++# IMAP IDLE mechanism
++IDLE=idle_@WITH_IDLE@.o
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++
++CC = @CC@
++INSTALL = @INSTALL@
++RANLIB = @RANLIB@
++AWK = @AWK@
++
++CYRUS_USER=@cyrus_user@
++CYRUS_GROUP=@cyrus_group@
++
++DEFS = @DEFS@ @LOCALDEFS@
++CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
++IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_OBJS = @SIEVE_OBJS@
++SIEVE_LIBS = @SIEVE_LIBS@
++IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
++LIB_WRAP = @LIB_WRAP@
++LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
++DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++
++CFLAGS = @CFLAGS@ @WARNERROR@
++LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
++
++SHELL = /bin/sh
++MAKEDEPEND = @MAKEDEPEND@
++
++COMPILE_ET=@COMPILE_ET@
++
++#
++# Some notes on purify --
++#     you probably want to run the make as the cyrus user as 
++#     purify sets the cache directory based on the user. So,
++#     if you don't, purify can't find the instrumented libraries
++#     and so you don't get any useful information.
++#     It may also help to run purify by hand to instrument any of
++#     the dynamic libraries that may crop up during run time.
++# 
++PURIFY=/usr/local/bin/purify
++PUREOPT= -best-effort -logfile=/tmp/pure/%v.%p.log -always_use_cache_dir -cachedir=/usr/tmp/$(USER)
++QUANTIFY=/usr/local/bin/quantify
++QUANTOPT=-windows=no -filename-prefix=/tmp/quant/%v.%p -write-summary-file= -logfile=/tmp/quant/%v.%p.log
++
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++cyrus_prefix = @cyrus_prefix@
++service_path = @service_path@
++
++LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
++	global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
++	convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
++	annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
++	imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \
++	$(SEEN) $(IDLE)
++
++IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o
++
++PROXYDOBJS=backend.o pushstats.o proxyd.o tls.o version.o 
++
++LMTPOBJS=lmtpstats.o lmtpengine.o spool.o tls.o
++
++# Your typical objects for the command line utilities
++CLIOBJS=cli_fatal.o mutex_fake.o
++
++SERVICE=../master/service.o
++SERVICETHREAD=../master/service-thread.o
++
++PROGS = imapd lmtpd pop3d \
++	fud smmapd reconstruct quota mbpath ipurge \
++	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
++	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
++	@IMAP_PROGS@
++
++BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
++	lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \
++	nntp_err.c nntp_err.h
++
++all: $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
++
++pure: imapd.pure lmtpd.pure proxyd.pure mupdate.pure lmtpproxyd.pure
++
++
++install:
++	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
++	for file in $(PROGS); \
++	do \
++		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++	done
++	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
++
++.c.o:
++	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
++	$<
++
++### libimap
++
++libimap.a: $(LOBJS)
++	rm -f libimap.a
++	ar cr libimap.a $(LOBJS)
++	$(RANLIB) libimap.a
++
++### Built Source Files
++
++xversion:
++	rm -f version.o
++	AWK=$(AWK) $(srcdir)/xversion.sh
++
++xversion.h: xversion
++
++pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
++	$(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
++
++pushstats.h: pushstats.c
++
++lmtpstats.c: lmtpstats.snmp $(srcdir)/../snmp/snmpgen
++	$(srcdir)/../snmp/snmpgen $(srcdir)/lmtpstats.snmp
++
++lmtpstats.h: lmtpstats.c
++
++imap_err.c: imap_err.et
++	$(COMPILE_ET) $(srcdir)/imap_err.et
++
++imap_err.h: imap_err.c
++
++nntp_err.c: nntp_err.et
++	$(COMPILE_ET) $(srcdir)/nntp_err.et
++
++nntp_err.h: nntp_err.c
++
++mupdate_err.c: mupdate_err.et
++	$(COMPILE_ET) $(srcdir)/mupdate_err.et
++
++mupdate_err.h: mupdate_err.c
++
++### Services
++idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o idled \
++	 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
++
++lmtpd: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \
++	$(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o lmtpd \
++	 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
++	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++lmtpd.pure: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
++	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
++	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
++	 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
++	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++lmtpproxyd: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
++	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o lmtpproxyd \
++	 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
++	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++lmtpproxyd.pure: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
++	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
++	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpproxyd.pure \
++	 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
++	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o imapd \
++	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
++	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
++	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
++	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o proxyd \
++	 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
++	 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++proxyd.pure: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o proxyd.pure \
++	 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
++	 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
++	libimap.a $(DEPLIBS)
++	$(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
++
++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
++
++pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
++	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
++	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
++	 smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
++	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
++	$(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
++
++### Command Line Utilities
++arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o deliver deliver.o backend.o $(LMTPOBJS) \
++	mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
++
++ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
++	$(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
++	$(DEPLIBS) $(LIBS)
++
++ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
++	libimap.a $(DEPLIBS) $(LIBS)
++
++tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) -o \
++	 $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
++
++### Other Misc Targets
++
++clean:
++	rm -f *.o *.a Makefile.bak makedepend.log \
++	$(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
++
++distclean: clean
++	rm -f Makefile
++
++depend: imap_err.h
++	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
++
++# DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-04-18 20:39:34.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/imapd.c	2006-04-18 20:39:35.689096237 +0200
+@@ -138,6 +138,18 @@
+     1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
+ };
+ 
++#ifdef DRAC_AUTH
++static struct {
++    int interval;		/* dracd "ping" interval; 0 = disabled */
++    unsigned long clientaddr;
++    struct prot_waitevent *event;
++} drac;
++
++extern int dracconn(char *server, char **errmsg);
++extern int dracsend(unsigned long userip, char **errmsg);
++extern int dracdisc(char **errmsg);
++#endif /* DRAC_AUTH */
++
+ /* current sub-user state */
+ static struct mailbox mboxstruct;
+ static struct mailbox *imapd_mailbox;
+@@ -560,6 +572,23 @@
+     /* setup for sending IMAP IDLE notifications */
+     idle_enabled();
+ 
++#ifdef DRAC_AUTH
++    /* setup for sending DRAC "pings" */
++    drac.event = NULL;
++    drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
++    if (drac.interval < 0) drac.interval = 0;
++    if (drac.interval) {
++	char *err;
++
++	if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
++	    /* disable DRAC */
++	    drac.interval = 0;
++	    syslog(LOG_ERR, "dracconn: %s", err);
++	    syslog(LOG_ERR, "DRAC notifications disabled");
++	}
++    }
++#endif /* DRAC_AUTH */
++
+     /* create connection to the SNMP listener, if available. */
+     snmp_connect(); /* ignore return code */
+     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
+@@ -652,6 +681,15 @@
+ 		imapd_haveaddr = 1;
+ 	    }
+ 	}
++
++#ifdef DRAC_AUTH
++	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
++	    drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
++	else
++	    drac.clientaddr = 0;
++    } else {
++	drac.clientaddr = 0;
++#endif /* DRAC_AUTH */
+     }
+ 
+     /* create the SASL connection */
+@@ -694,6 +732,11 @@
+     prot_flush(imapd_out);
+     snmp_increment(ACTIVE_CONNECTIONS, -1);
+ 
++#ifdef DRAC_AUTH
++    if (drac.event) prot_removewaitevent(imapd_in, drac.event);
++    drac.event = NULL;
++#endif /* DRAC_AUTH */
++
+     /* cleanup */
+     imapd_reset();
+ 
+@@ -774,6 +817,10 @@
+ 
+     cyrus_done();
+ 
++#ifdef DRAC_AUTH
++    if (drac.interval) (void) dracdisc((char **)NULL);
++#endif /* DRAC_AUTH */
++
+     exit(code);
+ }
+ 
+@@ -811,6 +858,35 @@
+     shut_down(code);
+ }
+ 
++#ifdef DRAC_AUTH
++/*
++ * Ping dracd every 'drac.interval' minutes
++ * to let it know that we are still connected
++ */
++struct prot_waitevent *drac_ping(struct protstream *s,
++				 struct prot_waitevent *ev, void *rock)
++{
++    char *err;
++    static int nfailure = 0;
++
++    if (dracsend(drac.clientaddr, &err) != 0) {
++	syslog(LOG_ERR, "dracsend: %s", err);
++	if (++nfailure >= 3) {
++	    /* can't contact dracd for 3 consecutive tries - disable DRAC */
++	    prot_removewaitevent(s, ev);
++	    drac.event = NULL;
++	    syslog(LOG_ERR, "DRAC notifications disabled");
++	    return NULL;
++	}
++    }
++    else
++	nfailure = 0;
++
++    ev->mark = time(NULL) + (drac.interval * 60);
++    return ev;
++}
++#endif /* DRAC_AUTH */
++
+ /*
+  * Top-level command loop parsing
+  */
+@@ -1848,6 +1924,11 @@
+ 
+     prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
+ 
++#ifdef DRAC_AUTH
++    if (drac.interval && drac.clientaddr)
++	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
++
+     /* Create telemetry log */
+     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
+ 
+@@ -1994,6 +2075,11 @@
+     prot_setsasl(imapd_in,  imapd_saslconn);
+     prot_setsasl(imapd_out, imapd_saslconn);
+ 
++#ifdef DRAC_AUTH
++    if (drac.interval && drac.clientaddr)
++	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
++
+     /* Create telemetry log */
+     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
+ 
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/imapd.c.orig
+--- cyrus-imapd-2.2.13/imap/imapd.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/imapd.c.orig	2006-04-18 20:39:35.700095168 +0200
+@@ -0,0 +1,7624 @@
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    "This product includes software developed by Computing Services
++ *    acknowledgment:
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/* $Id: imapd.c,v 1.498 2006/01/13 22:06:28 murch Exp $ */
++
++#include <config.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++#include <stdio.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++#include <signal.h>
++#include <fcntl.h>
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/stat.h>
++#include <syslog.h>
++#include <netdb.h>
++#include <sys/socket.h>
++#include <sys/wait.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
++#include <sasl/sasl.h>
++
++#include "acl.h"
++#include "annotate.h"
++#include "append.h"
++#include "auth.h"
++#include "backend.h"
++#include "charset.h"
++#include "exitcodes.h"
++#include "idle.h"
++#include "global.h"
++#include "imap_err.h"
++#include "imapd.h"
++#include "imapurl.h"
++#include "imparse.h"
++#include "iptostring.h"
++#include "mailbox.h"
++#include "message.h"
++#include "mboxname.h"
++#include "mboxlist.h"
++#include "mbdump.h"
++#include "mkgmtime.h"
++#include "mupdate-client.h"
++#include "quota.h"
++#include "telemetry.h"
++#include "tls.h"
++#include "user.h"
++#include "util.h"
++#include "version.h"
++#include "xmalloc.h"
++
++#include "pushstats.h"		/* SNMP interface */
++
++extern void seen_done(void);
++
++extern int optind;
++extern char *optarg;
++
++/* global state */
++const int config_need_data = CONFIG_NEED_PARTITION_DATA;
++
++static char shutdownfilename[1024];
++static int imaps = 0;
++static sasl_ssf_t extprops_ssf = 0;
++
++/* per-user/session state */
++struct protstream *imapd_out = NULL;
++struct protstream *imapd_in = NULL;
++static char imapd_clienthost[NI_MAXHOST*2+1] = "[local]";
++static int imapd_logfd = -1;
++char *imapd_userid;
++static char *imapd_magicplus = NULL;
++struct auth_state *imapd_authstate = 0;
++static int imapd_userisadmin = 0;
++static int imapd_userisproxyadmin = 0;
++static sasl_conn_t *imapd_saslconn; /* the sasl connection context */
++static int imapd_starttls_done = 0; /* have we done a successful starttls? */
++const char *plaintextloginalert = NULL;
++#ifdef HAVE_SSL
++/* our tls connection, if any */
++static SSL *tls_conn = NULL;
++#endif /* HAVE_SSL */
++
++/* stage(s) for APPEND */
++struct appendstage {
++    struct stagemsg *stage;
++    char **flag;
++    int nflags, flagalloc;
++    time_t internaldate;
++} **stage = NULL;
++unsigned long numstage = 0;
++
++/* the sasl proxy policy context */
++static struct proxy_context imapd_proxyctx = {
++    1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
++};
++
++/* current sub-user state */
++static struct mailbox mboxstruct;
++static struct mailbox *imapd_mailbox;
++int imapd_exists = -1;
++
++/* current namespace */
++static struct namespace imapd_namespace;
++
++static const char *monthname[] = {
++    "jan", "feb", "mar", "apr", "may", "jun",
++    "jul", "aug", "sep", "oct", "nov", "dec"
++};
++
++static const int max_monthdays[] = {
++    31, 29, 31, 30, 31, 30,
++    31, 31, 30, 31, 30, 31
++};
++
++void motd_file(int fd);
++void shut_down(int code);
++void fatal(const char *s, int code);
++
++void cmdloop(void);
++void cmd_login(char *tag, char *user);
++void cmd_authenticate(char *tag, char *authtype, char *resp);
++void cmd_noop(char *tag, char *cmd);
++void cmd_capability(char *tag);
++void cmd_append(char *tag, char *name);
++void cmd_select(char *tag, char *cmd, char *name);
++void cmd_close(char *tag);
++void cmd_fetch(char *tag, char *sequence, int usinguid);
++void cmd_partial(const char *tag, const char *msgno, char *data,
++		 const char *start, const char *count);
++void cmd_store(char *tag, char *sequence, char *operation, int usinguid);
++void cmd_search(char *tag, int usinguid);
++void cmd_sort(char *tag, int usinguid);
++void cmd_thread(char *tag, int usinguid);
++void cmd_copy(char *tag, char *sequence, char *name, int usinguid);
++void cmd_expunge(char *tag, char *sequence);
++void cmd_create(char *tag, char *name, char *partition, int localonly);
++void cmd_delete(char *tag, char *name, int localonly);
++void cmd_dump(char *tag, char *name, int uid_start);
++void cmd_undump(char *tag, char *name);
++void cmd_xfer(char *tag, char *name, char *toserver, char *topart);
++void cmd_rename(const char *tag, char *oldname, 
++		char *newname, char *partition);
++void cmd_reconstruct(const char *tag, const char *name, int recursive);
++void cmd_find(char *tag, char *namespace, char *pattern);
++void cmd_list(char *tag, int subscribed, char *reference, char *pattern);
++void cmd_changesub(char *tag, char *namespace, char *name, int add);
++void cmd_getacl(const char *tag, const char *name);
++void cmd_listrights(char *tag, char *name, char *identifier);
++void cmd_myrights(const char *tag, const char *name);
++void cmd_setacl(const char *tag, const char *name,
++		const char *identifier, const char *rights);
++void cmd_getquota(const char *tag, const char *name);
++void cmd_getquotaroot(const char *tag, const char *name);
++void cmd_setquota(const char *tag, const char *quotaroot);
++void cmd_status(char *tag, char *name);
++void cmd_getuids(char *tag, char *startuid);
++void cmd_unselect(char* tag);
++void cmd_namespace(char* tag);
++void cmd_mupdatepush(char *tag, char *name);
++void cmd_id(char* tag);
++extern void id_getcmdline(int argc, char **argv);
++extern void id_response(struct protstream *pout);
++
++void cmd_idle(char* tag);
++void idle_update(idle_flags_t flags);
++
++void cmd_starttls(char *tag, int imaps);
++
++#ifdef ENABLE_X_NETSCAPE_HACK
++void cmd_netscrape(char* tag);
++#endif
++
++void cmd_getannotation(char* tag, char *mboxpat);
++void cmd_setannotation(char* tag, char *mboxpat);
++
++int getannotatefetchdata(char *tag,
++			 struct strlist **entries, struct strlist **attribs);
++int getannotatestoredata(char *tag, struct entryattlist **entryatts);
++
++void annotate_response(struct entryattlist *l);
++
++#ifdef ENABLE_LISTEXT
++int getlistopts(char *tag, int *listopts);
++#endif
++
++int getsearchprogram(char *tag, struct searchargs *searchargs,
++			int *charset, int parsecharset);
++int getsearchcriteria(char *tag, struct searchargs *searchargs,
++			 int *charset, int parsecharset);
++int getsearchdate(time_t *start, time_t *end);
++int getsortcriteria(char *tag, struct sortcrit **sortcrit);
++int getdatetime(time_t *date);
++
++void printstring(const char *s);
++void printastring(const char *s);
++
++void appendfieldlist(struct fieldlist **l, char *section,
++		     struct strlist *fields, char *trail,
++		     void *d, size_t size);
++void freefieldlist(struct fieldlist *l);
++void freestrlist(struct strlist *l);
++void appendsearchargs(struct searchargs *s, struct searchargs *s1,
++			 struct searchargs *s2);
++void freesearchargs(struct searchargs *s);
++static void freesortcrit(struct sortcrit *s);
++
++static int mailboxdata(char *name, int matchlen, int maycreate, void *rock);
++static int listdata(char *name, int matchlen, int maycreate, void *rock);
++static void mstringdata(char *cmd, char *name, int matchlen, int maycreate,
++			int listopts);
++
++extern void setproctitle_init(int argc, char **argv, char **envp);
++extern int proc_register(const char *progname, const char *clienthost, 
++			 const char *userid, const char *mailbox);
++extern void proc_cleanup(void);
++
++extern int saslserver(sasl_conn_t *conn, const char *mech,
++		      const char *init_resp, const char *resp_prefix,
++		      const char *continuation, const char *empty_resp,
++		      struct protstream *pin, struct protstream *pout,
++		      int *sasl_result, char **success_data);
++
++/* Enable the resetting of a sasl_conn_t */
++static int reset_saslconn(sasl_conn_t **conn);
++
++static struct 
++{
++    char *ipremoteport;
++    char *iplocalport;
++    sasl_ssf_t ssf;
++    char *authid;
++} saslprops = {NULL,NULL,0,NULL};
++
++static int imapd_canon_user(sasl_conn_t *conn, void *context,
++			    const char *user, unsigned ulen,
++			    unsigned flags, const char *user_realm,
++			    char *out, unsigned out_max, unsigned *out_ulen)
++{
++    char userbuf[MAX_MAILBOX_NAME+1], *p;
++    size_t n;
++    int r;
++
++    if (!ulen) ulen = strlen(user);
++
++    if (config_getswitch(IMAPOPT_IMAPMAGICPLUS)) {
++	/* make a working copy of the auth[z]id */
++	if (ulen > MAX_MAILBOX_NAME) {
++	    sasl_seterror(conn, 0, "buffer overflow while canonicalizing");
++	    return SASL_BUFOVER;
++	}
++	memcpy(userbuf, user, ulen);
++	userbuf[ulen] = '\0';
++	user = userbuf;
++
++	/* See if we're using the magic plus
++	   (currently we don't support anything after '+') */
++	if ((p = strchr(userbuf, '+')) && 
++	    (n = config_virtdomains ? strcspn(p, "@") : strlen(p)) == 1) {
++
++	    if (flags & SASL_CU_AUTHZID) {
++		/* make a copy of the magic plus */
++		if (imapd_magicplus) free(imapd_magicplus);
++		imapd_magicplus = xstrndup(p, n);
++	    }
++
++	    /* strip the magic plus from the auth[z]id */
++	    memmove(p, p+n, strlen(p+n)+1);
++	    ulen -= n;
++	}
++    }
++
++    r = mysasl_canon_user(conn, context, user, ulen, flags, user_realm,
++			  out, out_max, out_ulen);
++
++    if (!r && imapd_magicplus && flags == SASL_CU_AUTHZID) {
++	/* If we're only doing the authzid, put back the magic plus
++	   in case its used in the challenge/response calculation */
++	n = strlen(imapd_magicplus);
++	if (*out_ulen + n > out_max) {
++	    sasl_seterror(conn, 0, "buffer overflow while canonicalizing");
++	    r = SASL_BUFOVER;
++	}
++	else {
++	    p = (config_virtdomains && (p = strchr(out, '@'))) ?
++		p : out + *out_ulen;
++	    memmove(p+n, p, strlen(p)+1);
++	    memcpy(p, imapd_magicplus, n);
++	    *out_ulen += n;
++	}
++    }
++
++    return r;
++}
++
++static int imapd_proxy_policy(sasl_conn_t *conn,
++			      void *context,
++			      const char *requested_user, unsigned rlen,
++			      const char *auth_identity, unsigned alen,
++			      const char *def_realm,
++			      unsigned urlen,
++			      struct propctx *propctx)
++{
++    if (config_getswitch(IMAPOPT_IMAPMAGICPLUS)) {
++	char userbuf[MAX_MAILBOX_NAME+1], *p;
++	size_t n;
++
++	/* make a working copy of the authzid */
++	if (!rlen) rlen = strlen(requested_user);
++	if (rlen > MAX_MAILBOX_NAME) {
++	    sasl_seterror(conn, 0, "buffer overflow while proxying");
++	    return SASL_BUFOVER;
++	}
++	memcpy(userbuf, requested_user, rlen);
++	userbuf[rlen] = '\0';
++	requested_user = userbuf;
++
++	/* See if we're using the magic plus */
++	if ((p = strchr(userbuf, '+'))) {
++	    n = config_virtdomains ? strcspn(p, "@") : strlen(p);
++
++	    /* strip the magic plus from the authzid */
++	    memmove(p, p+n, strlen(p+n)+1);
++	    rlen -= n;
++	}
++    }
++
++    return mysasl_proxy_policy(conn, context, requested_user, rlen,
++			       auth_identity, alen, def_realm, urlen, propctx);
++}
++
++static const struct sasl_callback mysasl_cb[] = {
++    { SASL_CB_GETOPT, &mysasl_config, NULL },
++    { SASL_CB_PROXY_POLICY, &imapd_proxy_policy, (void*) &imapd_proxyctx },
++    { SASL_CB_CANON_USER, &imapd_canon_user, NULL },
++    { SASL_CB_LIST_END, NULL, NULL }
++};
++
++/* imapd_refer() issues a referral to the client. */
++static void imapd_refer(const char *tag,
++			const char *server,
++			const char *mailbox)
++{
++    char url[MAX_MAILBOX_PATH+1];
++
++    if(!strcmp(imapd_userid, "anonymous")) {
++	imapurl_toURL(url, server, mailbox, "ANONYMOUS");
++    } else {
++	imapurl_toURL(url, server, mailbox, "*");
++    }
++    
++    prot_printf(imapd_out, "%s NO [REFERRAL %s] Remote mailbox.\r\n", 
++		tag, url);
++}
++
++/* wrapper for mboxlist_lookup that will force a referral if we are remote
++ * returns IMAP_SERVER_UNAVAILABLE if we don't have a place to send the client
++ * (that'd be a bug).
++ * returns IMAP_MAILBOX_MOVED if we referred the client */
++/* ext_name is the external name of the mailbox */
++/* you can avoid referring the client by setting tag or ext_name to NULL. */
++static int mlookup(const char *tag, const char *ext_name,
++		   const char *name, int *flags, char **pathp, char **partp,
++		   char **aclp, struct txn **tid) 
++{
++    int r, mbtype;
++    char *remote, *acl;
++
++    r = mboxlist_detail(name, &mbtype, pathp, &remote, &acl, tid);
++
++    if(partp) *partp = remote;
++    if(aclp) *aclp = acl;
++    if(flags) *flags = mbtype;
++    if(r) return r;
++
++    if(mbtype & MBTYPE_RESERVE) return IMAP_MAILBOX_RESERVED;
++    
++    if(mbtype & MBTYPE_MOVING) {
++	/* do we have rights on the mailbox? */
++	if(!imapd_userisadmin &&
++	   (!acl || !(cyrus_acl_myrights(imapd_authstate,acl) & ACL_LOOKUP))) {
++	    r = IMAP_MAILBOX_NONEXISTENT;
++	} else if(tag && ext_name && remote && *remote) {
++	    char *c = NULL;
++	    
++	    c = strchr(remote, '!');
++	    if(c) *c = '\0';
++	    imapd_refer(tag, remote, ext_name);
++	    r = IMAP_MAILBOX_MOVED;
++	} else if(config_mupdate_server) {
++	    r = IMAP_SERVER_UNAVAILABLE;
++	} else {
++	    r = IMAP_MAILBOX_NOTSUPPORTED;
++	}
++    }
++    
++    return r;
++}
++
++static void imapd_reset(void)
++{
++    proc_cleanup();
++
++    if (imapd_mailbox) {
++	index_closemailbox(imapd_mailbox);
++	mailbox_close(imapd_mailbox);
++	imapd_mailbox = 0;
++    }
++
++    if (imapd_in) {
++	/* Flush the incoming buffer */
++	prot_NONBLOCK(imapd_in);
++	prot_fill(imapd_in);
++
++	prot_free(imapd_in);
++    }
++
++    if (imapd_out) {
++	/* Flush the outgoing buffer */
++	prot_flush(imapd_out);
++
++	prot_free(imapd_out);
++    }
++    
++    imapd_in = imapd_out = NULL;
++
++#ifdef HAVE_SSL
++    if (tls_conn) {
++	if (tls_reset_servertls(&tls_conn) == -1) {
++	    fatal("tls_reset() failed", EC_TEMPFAIL);
++	}
++	tls_conn = NULL;
++    }
++#endif
++
++    cyrus_reset_stdio(); 
++
++    strcpy(imapd_clienthost, "[local]");
++    if (imapd_logfd != -1) {
++	close(imapd_logfd);
++	imapd_logfd = -1;
++    }
++    if (imapd_userid != NULL) {
++	free(imapd_userid);
++	imapd_userid = NULL;
++    }
++    if (imapd_magicplus != NULL) {
++	free(imapd_magicplus);
++	imapd_magicplus = NULL;
++    }
++    if (imapd_authstate) {
++	auth_freestate(imapd_authstate);
++	imapd_authstate = NULL;
++    }
++    imapd_userisadmin = 0;
++    imapd_userisproxyadmin = 0;
++    if (imapd_saslconn) {
++	sasl_dispose(&imapd_saslconn);
++	imapd_saslconn = NULL;
++    }
++    imapd_starttls_done = 0;
++    plaintextloginalert = NULL;
++
++    if(saslprops.iplocalport) {
++	free(saslprops.iplocalport);
++	saslprops.iplocalport = NULL;
++    }
++    if(saslprops.ipremoteport) {
++	free(saslprops.ipremoteport);
++	saslprops.ipremoteport = NULL;
++    }
++    if(saslprops.authid) {
++	free(saslprops.authid);
++	saslprops.authid = NULL;
++    }
++    saslprops.ssf = 0;
++
++    imapd_exists = -1;
++}
++
++/*
++ * run once when process is forked;
++ * MUST NOT exit directly; must return with non-zero error code
++ */
++int service_init(int argc, char **argv, char **envp)
++{
++    int ret;
++    int opt;
++    
++    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
++    setproctitle_init(argc, argv, envp);
++
++    /* set signal handlers */
++    signals_set_shutdown(&shut_down);
++    signal(SIGPIPE, SIG_IGN);
++
++    /* load the SASL plugins */
++    global_sasl_init(1, 1, mysasl_cb);
++
++    ret = snprintf(shutdownfilename, sizeof(shutdownfilename),
++		   "%s/msg/shutdown", config_dir);
++    
++    if(ret < 0 || ret >= sizeof(shutdownfilename)) {
++       fatal("shutdownfilename buffer too small (configdirectory too long)",
++	     EC_CONFIG);
++    }
++
++    /* open the mboxlist, we'll need it for real work */
++    mboxlist_init(0);
++    mboxlist_open(NULL);
++    mailbox_initialize();
++
++    /* open the quota db, we'll need it for real work */
++    quotadb_init(0);
++    quotadb_open(NULL);
++
++    /* setup for sending IMAP IDLE notifications */
++    idle_enabled();
++
++    /* create connection to the SNMP listener, if available. */
++    snmp_connect(); /* ignore return code */
++    snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
++
++    while ((opt = getopt(argc, argv, "sp:")) != EOF) {
++	switch (opt) {
++	case 's': /* imaps (do starttls right away) */
++	    imaps = 1;
++	    if (!tls_enabled()) {
++		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
++		fatal("imaps: required OpenSSL options not present",
++		      EC_CONFIG);
++	    }
++	    break;
++	case 'p': /* external protection */
++	    extprops_ssf = atoi(optarg);
++	    break;
++	default:
++	    break;
++	}
++    }
++
++    /* Initialize the annotatemore extention */
++    annotatemore_init(0, NULL, NULL);
++    annotatemore_open(NULL);
++
++    return 0;
++}
++
++/*
++ * run for each accepted connection
++ */
++#ifdef ID_SAVE_CMDLINE
++int service_main(int argc, char **argv, char **envp __attribute__((unused)))
++#else
++int service_main(int argc __attribute__((unused)),
++		 char **argv __attribute__((unused)),
++		 char **envp __attribute__((unused)))
++#endif
++{
++    socklen_t salen;
++    int timeout;
++    sasl_security_properties_t *secprops = NULL;
++    struct sockaddr_storage imapd_localaddr, imapd_remoteaddr;
++    char localip[60], remoteip[60];
++    char hbuf[NI_MAXHOST];
++    int niflags;
++    int imapd_haveaddr = 0;
++
++    signals_poll();
++
++#ifdef ID_SAVE_CMDLINE
++    /* get command line args for use in ID before getopt mangles them */
++    id_getcmdline(argc, argv);
++#endif
++
++    imapd_in = prot_new(0, 0);
++    imapd_out = prot_new(1, 1);
++
++    /* Find out name of client host */
++    salen = sizeof(imapd_remoteaddr);
++    if (getpeername(0, (struct sockaddr *)&imapd_remoteaddr, &salen) == 0 &&
++	(imapd_remoteaddr.ss_family == AF_INET ||
++	 imapd_remoteaddr.ss_family == AF_INET6)) {
++	if (getnameinfo((struct sockaddr *)&imapd_remoteaddr, salen,
++			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
++	    strncpy(imapd_clienthost, hbuf, sizeof(hbuf));
++	    strlcat(imapd_clienthost, " ", sizeof(imapd_clienthost));
++	    imapd_clienthost[sizeof(imapd_clienthost)-30] = '\0';
++	} else {
++	    imapd_clienthost[0] = '\0';
++	}
++	niflags = NI_NUMERICHOST;
++#ifdef NI_WITHSCOPEID
++	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET6)
++	    niflags |= NI_WITHSCOPEID;
++#endif
++	if (getnameinfo((struct sockaddr *)&imapd_remoteaddr, salen, hbuf,
++			sizeof(hbuf), NULL, 0, niflags) != 0)
++	    strlcpy(hbuf, "unknown", sizeof(hbuf));
++	strlcat(imapd_clienthost, "[", sizeof(imapd_clienthost));
++	strlcat(imapd_clienthost, hbuf, sizeof(imapd_clienthost));
++	strlcat(imapd_clienthost, "]", sizeof(imapd_clienthost));
++	salen = sizeof(imapd_localaddr);
++	if (getsockname(0, (struct sockaddr *)&imapd_localaddr, &salen) == 0) {
++	    if(iptostring((struct sockaddr *)&imapd_remoteaddr, salen,
++			  remoteip, sizeof(remoteip)) == 0
++	       && iptostring((struct sockaddr *)&imapd_localaddr, salen,
++			     localip, sizeof(localip)) == 0) {
++		imapd_haveaddr = 1;
++	    }
++	}
++    }
++
++    /* create the SASL connection */
++    if (sasl_server_new("imap", config_servername, 
++			NULL, NULL, NULL, NULL, 0, 
++			&imapd_saslconn) != SASL_OK) {
++	fatal("SASL failed initializing: sasl_server_new()", EC_TEMPFAIL);
++    }
++
++    /* never allow plaintext, since IMAP has the LOGIN command */
++    secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT);
++    sasl_setprop(imapd_saslconn, SASL_SEC_PROPS, secprops);
++    sasl_setprop(imapd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf);
++
++    if (imapd_haveaddr) {
++	sasl_setprop(imapd_saslconn, SASL_IPREMOTEPORT, remoteip);
++	saslprops.ipremoteport = xstrdup(remoteip);
++	sasl_setprop(imapd_saslconn, SASL_IPLOCALPORT, localip);
++	saslprops.iplocalport = xstrdup(localip);
++    }
++
++    proc_register("imapd", imapd_clienthost, NULL, NULL);
++
++    /* Set inactivity timer */
++    timeout = config_getint(IMAPOPT_TIMEOUT);
++    if (timeout < 30) timeout = 30;
++    prot_settimeout(imapd_in, timeout*60);
++    prot_setflushonread(imapd_in, imapd_out);
++
++    /* we were connected on imaps port so we should do 
++       TLS negotiation immediately */
++    if (imaps == 1) cmd_starttls(NULL, 1);
++
++    snmp_increment(TOTAL_CONNECTIONS, 1);
++    snmp_increment(ACTIVE_CONNECTIONS, 1);
++
++    cmdloop();
++
++    /* LOGOUT executed */
++    prot_flush(imapd_out);
++    snmp_increment(ACTIVE_CONNECTIONS, -1);
++
++    /* cleanup */
++    imapd_reset();
++
++    return 0;
++}
++
++/* Called by service API to shut down the service */
++void service_abort(int error)
++{
++    shut_down(error);
++}
++
++/*
++ * found a motd file; spit out message and return
++ */
++void motd_file(fd)
++int fd;
++{
++    struct protstream *motd_in;
++    char buf[1024];
++    char *p;
++
++    motd_in = prot_new(fd, 0);
++
++    prot_fgets(buf, sizeof(buf), motd_in);
++    if ((p = strchr(buf, '\r'))!=NULL) *p = 0;
++    if ((p = strchr(buf, '\n'))!=NULL) *p = 0;
++
++    for(p = buf; *p == '['; p++); /* can't have [ be first char, sigh */
++    prot_printf(imapd_out, "* OK [ALERT] %s\r\n", p);
++}
++
++/*
++ * Cleanly shut down and exit
++ */
++void shut_down(int code) __attribute__((noreturn));
++void shut_down(int code)
++{
++    proc_cleanup();
++    if (imapd_mailbox) {
++	index_closemailbox(imapd_mailbox);
++	mailbox_close(imapd_mailbox);
++    }
++    seen_done();
++    mboxlist_close();
++    mboxlist_done();
++
++    quotadb_close();
++    quotadb_done();
++
++    annotatemore_close();
++    annotatemore_done();
++
++    if (imapd_in) {
++	/* Flush the incoming buffer */
++	prot_NONBLOCK(imapd_in);
++	prot_fill(imapd_in);
++	
++	prot_free(imapd_in);
++    }
++    
++    if (imapd_out) {
++	/* Flush the outgoing buffer */
++	prot_flush(imapd_out);
++	prot_free(imapd_out);
++	
++	/* one less active connection */
++	snmp_increment(ACTIVE_CONNECTIONS, -1);
++    }
++
++#ifdef HAVE_SSL
++    tls_shutdown_serverengine();
++#endif
++    /* shutdown socket nicely */
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
++
++    cyrus_done();
++
++    exit(code);
++}
++
++void fatal(const char *s, int code)
++{
++    static int recurse_code = 0;
++
++    if (recurse_code) {
++	/* We were called recursively. Just give up */
++	proc_cleanup();
++	snmp_increment(ACTIVE_CONNECTIONS, -1);
++	exit(recurse_code);
++    }
++    recurse_code = code;
++    if (imapd_out) {
++	prot_printf(imapd_out, "* BYE Fatal error: %s\r\n", s);
++	prot_flush(imapd_out);
++    }
++    if (stage) {
++	/* Cleanup the stage(s) */
++	while (numstage) {
++	    struct appendstage *curstage = stage[--numstage];
++
++	    append_removestage(curstage->stage);
++	    while (curstage->nflags--) {
++		free(curstage->flag[curstage->nflags]);
++	    }
++	    if (curstage->flag) free((char *) curstage->flag);
++	    free(curstage);
++	}
++	free(stage);
++    }
++
++    syslog(LOG_ERR, "Fatal error: %s", s);
++    shut_down(code);
++}
++
++/*
++ * Top-level command loop parsing
++ */
++void cmdloop()
++{
++    int fd;
++    char motdfilename[1024];
++    int c;
++    int ret;
++    int usinguid, havepartition, havenamespace, recursive;
++    static struct buf tag, cmd, arg1, arg2, arg3, arg4;
++    char *p, shut[1024];
++    const char *err;
++
++    prot_printf(imapd_out,
++		"* OK %s Cyrus IMAP4 %s server ready\r\n", config_servername,
++		CYRUS_VERSION);
++
++    ret = snprintf(motdfilename, sizeof(motdfilename), "%s/msg/motd",
++		   config_dir);
++    
++    if(ret < 0 || ret >= sizeof(motdfilename)) {
++       fatal("motdfilename buffer too small (configdirectory too long)",
++	     EC_CONFIG);
++    }
++    
++    if ((fd = open(motdfilename, O_RDONLY, 0)) != -1) {
++	motd_file(fd);
++	close(fd);
++    }
++
++    for (;;) {
++	if ( !imapd_userisadmin && imapd_userid
++	     && shutdown_file(shut, sizeof(shut))) {
++	    for (p = shut; *p == '['; p++); /* can't have [ be first char */
++	    prot_printf(imapd_out, "* BYE [ALERT] %s\r\n", p);
++	    shut_down(0);
++	}
++
++	signals_poll();
++
++	/* Parse tag */
++	c = getword(imapd_in, &tag);
++	if (c == EOF) {
++	    if ((err = prot_error(imapd_in))!=NULL
++		&& strcmp(err, PROT_EOF_STRING)) {
++		syslog(LOG_WARNING, "%s, closing connection", err);
++		prot_printf(imapd_out, "* BYE %s\r\n", err);
++	    }
++	    return;
++	}
++	if (c != ' ' || !imparse_isatom(tag.s) || (tag.s[0] == '*' && !tag.s[1])) {
++	    prot_printf(imapd_out, "* BAD Invalid tag\r\n");
++	    eatline(imapd_in, c);
++	    continue;
++	}
++
++	/* Parse command name */
++	c = getword(imapd_in, &cmd);
++	if (!cmd.s[0]) {
++	    prot_printf(imapd_out, "%s BAD Null command\r\n", tag.s);
++	    eatline(imapd_in, c);
++	    continue;
++	}
++	if (islower((unsigned char) cmd.s[0])) 
++	    cmd.s[0] = toupper((unsigned char) cmd.s[0]);
++	for (p = &cmd.s[1]; *p; p++) {
++	    if (isupper((unsigned char) *p)) *p = tolower((unsigned char) *p);
++	}
++
++	if (plaintextloginalert) {
++	    prot_printf(imapd_out, "* OK [ALERT] %s\r\n",
++			plaintextloginalert);
++	    plaintextloginalert = NULL;
++	}
++
++	/* Only Authenticate/Login/Logout/Noop/Capability/Id/Starttls
++	   allowed when not logged in */
++	if (!imapd_userid && !strchr("ALNCIS", cmd.s[0])) goto nologin;
++    
++	/* note that about half the commands (the common ones that don't
++	   hit the mailboxes file) now close the mailboxes file just in
++	   case it was open. */
++	switch (cmd.s[0]) {
++	case 'A':
++	    if (!strcmp(cmd.s, "Authenticate")) {
++		int haveinitresp = 0;
++
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg1);
++		if (!imparse_isatom(arg1.s)) {
++		    prot_printf(imapd_out, "%s BAD Invalid authenticate mechanism\r\n", tag.s);
++		    eatline(imapd_in, c);
++		    continue;
++		}
++		if (c == ' ') {
++		    haveinitresp = 1;
++		    c = getword(imapd_in, &arg2);
++		    if (c == EOF) goto missingargs;
++		}
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		
++		if (imapd_userid) {
++		    prot_printf(imapd_out, "%s BAD Already authenticated\r\n", tag.s);
++		    continue;
++		}
++		cmd_authenticate(tag.s, arg1.s, haveinitresp ? arg2.s : NULL);
++
++		snmp_increment(AUTHENTICATE_COUNT, 1);
++	    }
++	    else if (!imapd_userid) goto nologin;
++	    else if (!strcmp(cmd.s, "Append")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++
++		cmd_append(tag.s, arg1.s);
++
++		snmp_increment(APPEND_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'B':
++	    if (!strcmp(cmd.s, "Bboard")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_select(tag.s, cmd.s, arg1.s);
++
++		snmp_increment(BBOARD_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'C':
++	    if (!strcmp(cmd.s, "Capability")) {
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_capability(tag.s);
++
++		snmp_increment(CAPABILITY_COUNT, 1);
++	    }
++	    else if (!imapd_userid) goto nologin;
++	    else if (!strcmp(cmd.s, "Check")) {
++		if (!imapd_mailbox) goto nomailbox;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_noop(tag.s, cmd.s);
++
++		snmp_increment(CHECK_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Copy")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    copy:
++		c = getword(imapd_in, &arg1);
++		if (c == '\r') goto missingargs;
++		if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_copy(tag.s, arg1.s, arg2.s, usinguid);
++
++		snmp_increment(COPY_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Create")) {
++		havepartition = 0;
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == ' ') {
++		    havepartition = 1;
++		    c = getword(imapd_in, &arg2);
++		    if (!imparse_isatom(arg2.s)) goto badpartition;
++		}
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_create(tag.s, arg1.s, havepartition ? arg2.s : 0, 0);
++
++		snmp_increment(CREATE_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Close")) {
++		if (!imapd_mailbox) goto nomailbox;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_close(tag.s);
++
++		snmp_increment(CLOSE_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'D':
++	    if (!strcmp(cmd.s, "Delete")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_delete(tag.s, arg1.s, 0);
++
++		snmp_increment(DELETE_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Deleteacl")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_setacl(tag.s, arg1.s, arg2.s, NULL);
++
++		snmp_increment(DELETEACL_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Dump")) {
++		int uid_start = 0;
++		
++		if(c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if(c == ' ') {
++		    c = getastring(imapd_in, imapd_out, &arg2);
++		    if(!imparse_isnumber(arg2.s)) goto extraargs;
++		    uid_start = atoi(arg2.s);
++		}
++		
++		if(c == '\r') c = prot_getc(imapd_in);
++		if(c != '\n') goto extraargs;
++		
++		cmd_dump(tag.s, arg1.s, uid_start);
++	    /*	snmp_increment(DUMP_COUNT, 1);*/
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'E':
++	    if (!strcmp(cmd.s, "Expunge")) {
++		if (!imapd_mailbox) goto nomailbox;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_expunge(tag.s, 0);
++
++		snmp_increment(EXPUNGE_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Examine")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_select(tag.s, cmd.s, arg1.s);
++
++		snmp_increment(EXAMINE_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'F':
++	    if (!strcmp(cmd.s, "Fetch")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    fetch:
++		c = getword(imapd_in, &arg1);
++		if (c == '\r') goto missingargs;
++		if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
++
++		cmd_fetch(tag.s, arg1.s, usinguid);
++
++		snmp_increment(FETCH_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Find")) {
++		c = getword(imapd_in, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_find(tag.s, arg1.s, arg2.s);
++
++		snmp_increment(FIND_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'G':
++	    if (!strcmp(cmd.s, "Getacl")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_getacl(tag.s, arg1.s);
++
++		snmp_increment(GETACL_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Getannotation")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++
++		cmd_getannotation(tag.s, arg1.s);
++
++		snmp_increment(GETANNOTATION_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Getquota")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_getquota(tag.s, arg1.s);
++
++		snmp_increment(GETQUOTA_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Getquotaroot")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_getquotaroot(tag.s, arg1.s);
++
++		snmp_increment(GETQUOTAROOT_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'I':
++	    if (!strcmp(cmd.s, "Id")) {
++		if (c != ' ') goto missingargs;
++		cmd_id(tag.s);
++
++		snmp_increment(ID_COUNT, 1);
++	    }
++	    else if (!imapd_userid) goto nologin;
++	    else if (!strcmp(cmd.s, "Idle")) {
++		if (!idle_enabled()) {
++		    /* we don't support idle */
++		    goto badcmd;
++		}
++
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_idle(tag.s);
++
++		snmp_increment(IDLE_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'L':
++	    if (!strcmp(cmd.s, "Login")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if(c != ' ') goto missingargs;
++
++		cmd_login(tag.s, arg1.s);
++
++		snmp_increment(LOGIN_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Logout")) {
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		snmp_increment(LOGOUT_COUNT, 1);		
++
++		prot_printf(imapd_out, "* BYE %s\r\n", 
++			    error_message(IMAP_BYE_LOGOUT));
++		prot_printf(imapd_out, "%s OK %s\r\n", tag.s, 
++			    error_message(IMAP_OK_COMPLETED));
++		return;
++	    }
++	    else if (!imapd_userid) goto nologin;
++	    else if (!strcmp(cmd.s, "List")) {
++		int listopts = LIST_CHILDREN;
++#ifdef ENABLE_LISTEXT
++		/* Check for and parse LISTEXT options */
++		c = prot_getc(imapd_in);
++		if (c == '(') {
++		    c = getlistopts(tag.s, &listopts);
++		    if (c == EOF) {
++			eatline(imapd_in, c);
++			continue;
++		    }
++		}
++		else
++		    prot_ungetc(c, imapd_in);
++#endif /* ENABLE_LISTEXT */
++		if (imapd_magicplus) listopts |= LIST_SUBSCRIBED;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_list(tag.s, listopts, arg1.s, arg2.s);
++
++		snmp_increment(LIST_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Lsub")) {
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_list(tag.s, LIST_LSUB | LIST_CHILDREN, arg1.s, arg2.s);
++
++		snmp_increment(LSUB_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Listrights")) {
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_listrights(tag.s, arg1.s, arg2.s);
++
++		snmp_increment(LISTRIGHTS_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Localcreate")) {
++		/* create a local-only mailbox */
++		havepartition = 0;
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == ' ') {
++		    havepartition = 1;
++		    c = getword(imapd_in, &arg2);
++		    if (!imparse_isatom(arg2.s)) goto badpartition;
++		}
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_create(tag.s, arg1.s, havepartition ? arg2.s : NULL, 1);
++
++		/* xxxx snmp_increment(CREATE_COUNT, 1); */
++	    }
++	    else if (!strcmp(cmd.s, "Localdelete")) {
++		/* delete a mailbox locally only */
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_delete(tag.s, arg1.s, 1);
++
++		/* xxxx snmp_increment(DELETE_COUNT, 1); */
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'M':
++	    if (!strcmp(cmd.s, "Myrights")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_myrights(tag.s, arg1.s);
++
++		/* xxxx snmp_increment(MYRIGHTS_COUNT, 1); */
++	    }
++	    else if (!strcmp(cmd.s, "Mupdatepush")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if(c == EOF) goto missingargs;
++		if(c == '\r') c = prot_getc(imapd_in);
++		if(c != '\n') goto extraargs;
++		cmd_mupdatepush(tag.s, arg1.s);
++		
++		/* xxxx snmp_increment(MUPDATEPUSH_COUNT, 1); */
++	    } else goto badcmd;
++	    break;
++
++	case 'N':
++	    if (!strcmp(cmd.s, "Noop")) {
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_noop(tag.s, cmd.s);
++
++		/* xxxx snmp_increment(NOOP_COUNT, 1); */
++	    }
++#ifdef ENABLE_X_NETSCAPE_HACK
++	    else if (!strcmp(cmd.s, "Netscape")) {
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_netscrape(tag.s);
++	    }
++#endif
++	    else if (!imapd_userid) goto nologin;
++	    else if (!strcmp(cmd.s, "Namespace")) {
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_namespace(tag.s);
++
++		/* xxxx snmp_increment(NAMESPACE_COUNT, 1); */
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'P':
++	    if (!strcmp(cmd.s, "Partial")) {
++		if (!imapd_mailbox) goto nomailbox;
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg2);
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg3);
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg4);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_partial(tag.s, arg1.s, arg2.s, arg3.s, arg4.s);
++
++		/* xxxx snmp_increment(PARTIAL_COUNT, 1); */
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'R':
++	    if (!strcmp(cmd.s, "Rename")) {
++		havepartition = 0;
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == EOF) goto missingargs;
++		if (c == ' ') {
++		    havepartition = 1;
++		    c = getword(imapd_in, &arg3);
++		    if (!imparse_isatom(arg3.s)) goto badpartition;
++		}
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_rename(tag.s, arg1.s, arg2.s, havepartition ? arg3.s : 0);
++
++		/* xxxx snmp_increment(RENAME_COUNT, 1); */
++	    } else if(!strcmp(cmd.s, "Reconstruct")) {
++		recursive = 0;
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if(c == ' ') {
++		    /* Optional RECURSEIVE argument */
++		    c = getword(imapd_in, &arg2);
++		    if(!imparse_isatom(arg2.s))
++			goto extraargs;
++		    else if(!strcasecmp(arg2.s, "RECURSIVE"))
++			recursive = 1;
++		    else
++			goto extraargs;
++		}
++		if(c == '\r') c = prot_getc(imapd_in);
++		if(c != '\n') goto extraargs;
++		cmd_reconstruct(tag.s, arg1.s, recursive);
++
++		/* snmp_increment(RECONSTRUCT_COUNT, 1); */
++	    } 
++	    else if (!strcmp(cmd.s, "Rlist")) {
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_list(tag.s, LIST_CHILDREN | LIST_REMOTE, arg1.s, arg2.s);
++
++/* 		snmp_increment(LIST_COUNT, 1); */
++	    }
++	    else if (!strcmp(cmd.s, "Rlsub")) {
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_list(tag.s, LIST_LSUB | LIST_CHILDREN | LIST_REMOTE,
++			 arg1.s, arg2.s);
++/* 		snmp_increment(LSUB_COUNT, 1); */
++	    } else goto badcmd;
++	    break;
++	    
++	case 'S':
++	    if (!strcmp(cmd.s, "Starttls")) {
++		if (!tls_enabled()) {
++		    /* we don't support starttls */
++		    goto badcmd;
++		}
++
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		/* if we've already done SASL fail */
++		if (imapd_userid != NULL) {
++		    prot_printf(imapd_out, 
++	       "%s BAD Can't Starttls after authentication\r\n", tag.s);
++		    continue;
++		}
++		
++		/* check if already did a successful tls */
++		if (imapd_starttls_done == 1) {
++		    prot_printf(imapd_out, 
++				"%s BAD Already did a successful Starttls\r\n",
++				tag.s);
++		    continue;
++		}
++		cmd_starttls(tag.s, 0);	
++
++		snmp_increment(STARTTLS_COUNT, 1);      
++		continue;
++	    }
++	    if (!imapd_userid) {
++		goto nologin;
++	    } else if (!strcmp(cmd.s, "Store")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    store:
++		c = getword(imapd_in, &arg1);
++		if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
++		c = getword(imapd_in, &arg2);
++		if (c != ' ') goto missingargs;
++
++		cmd_store(tag.s, arg1.s, arg2.s, usinguid);
++
++		snmp_increment(STORE_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Select")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_select(tag.s, cmd.s, arg1.s);
++
++		snmp_increment(SELECT_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Search")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    search:
++
++		cmd_search(tag.s, usinguid);
++
++		snmp_increment(SEARCH_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Subscribe")) {
++		if (c != ' ') goto missingargs;
++		havenamespace = 0;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == ' ') {
++		    havenamespace = 1;
++		    c = getastring(imapd_in, imapd_out, &arg2);
++		}
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		if (havenamespace) {
++		    cmd_changesub(tag.s, arg1.s, arg2.s, 1);
++		}
++		else {
++		    cmd_changesub(tag.s, (char *)0, arg1.s, 1);
++		}
++		snmp_increment(SUBSCRIBE_COUNT, 1);
++	    }		
++	    else if (!strcmp(cmd.s, "Setacl")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg3);
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_setacl(tag.s, arg1.s, arg2.s, arg3.s);
++
++		snmp_increment(SETACL_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Setannotation")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++
++		cmd_setannotation(tag.s, arg1.s);
++
++		snmp_increment(SETANNOTATION_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Setquota")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		cmd_setquota(tag.s, arg1.s);
++
++		snmp_increment(SETQUOTA_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Sort")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    sort:
++		cmd_sort(tag.s, usinguid);
++
++		snmp_increment(SORT_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Status")) {
++		if (c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c != ' ') goto missingargs;
++		cmd_status(tag.s, arg1.s);
++
++		snmp_increment(STATUS_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'T':
++	    if (!strcmp(cmd.s, "Thread")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 0;
++		if (c != ' ') goto missingargs;
++	    thread:
++		cmd_thread(tag.s, usinguid);
++
++		snmp_increment(THREAD_COUNT, 1);
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'U':
++	    if (!strcmp(cmd.s, "Uid")) {
++		if (!imapd_mailbox) goto nomailbox;
++		usinguid = 1;
++		if (c != ' ') goto missingargs;
++		c = getword(imapd_in, &arg1);
++		if (c != ' ') goto missingargs;
++		lcase(arg1.s);
++		if (!strcmp(arg1.s, "fetch")) {
++		    goto fetch;
++		}
++		else if (!strcmp(arg1.s, "store")) {
++		    goto store;
++		}
++		else if (!strcmp(arg1.s, "search")) {
++		    goto search;
++		}
++		else if (!strcmp(arg1.s, "sort")) {
++		    goto sort;
++		}
++		else if (!strcmp(arg1.s, "thread")) {
++		    goto thread;
++		}
++		else if (!strcmp(arg1.s, "copy")) {
++		    goto copy;
++		}
++		else if (!strcmp(arg1.s, "expunge")) {
++		    c = getword(imapd_in, &arg1);
++		    if (!imparse_issequence(arg1.s)) goto badsequence;
++		    if (c == '\r') c = prot_getc(imapd_in);
++		    if (c != '\n') goto extraargs;
++		    cmd_expunge(tag.s, arg1.s);
++
++		    snmp_increment(EXPUNGE_COUNT, 1);
++		}
++		else {
++		    prot_printf(imapd_out, "%s BAD Unrecognized UID subcommand\r\n", tag.s);
++		    eatline(imapd_in, c);
++		}
++	    }
++	    else if (!strcmp(cmd.s, "Unsubscribe")) {
++		if (c != ' ') goto missingargs;
++		havenamespace = 0;
++		c = getastring(imapd_in, imapd_out, &arg1);
++		if (c == ' ') {
++		    havenamespace = 1;
++		    c = getastring(imapd_in, imapd_out, &arg2);
++		}
++		if (c == EOF) goto missingargs;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		if (havenamespace) {
++		    cmd_changesub(tag.s, arg1.s, arg2.s, 0);
++		}
++		else {
++		    cmd_changesub(tag.s, (char *)0, arg1.s, 0);
++		}
++
++		snmp_increment(UNSUBSCRIBE_COUNT, 1);
++	    }		
++	    else if (!strcmp(cmd.s, "Unselect")) {
++		if (!imapd_mailbox) goto nomailbox;
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++		cmd_unselect(tag.s);
++
++		snmp_increment(UNSELECT_COUNT, 1);
++	    }
++	    else if (!strcmp(cmd.s, "Undump")) {
++		if(c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++
++		/* we want to get a list at this point */
++		if(c != ' ') goto missingargs;
++		
++		cmd_undump(tag.s, arg1.s);
++	    /*	snmp_increment(UNDUMP_COUNT, 1);*/
++	    }
++	    else goto badcmd;
++	    break;
++
++	case 'X':
++	    if (!strcmp(cmd.s, "Xfer")) {
++		int havepartition = 0;
++		
++		/* Mailbox */
++		if(c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg1);
++
++		/* Dest Server */
++		if(c != ' ') goto missingargs;
++		c = getastring(imapd_in, imapd_out, &arg2);
++
++		if(c == ' ') {
++		    /* Dest Partition */
++		    c = getastring(imapd_in, imapd_out, &arg3);
++		    if (!imparse_isatom(arg3.s)) goto badpartition;
++		    havepartition = 1;
++		}
++		
++		if (c == '\r') c = prot_getc(imapd_in);
++		if (c != '\n') goto extraargs;
++
++		cmd_xfer(tag.s, arg1.s, arg2.s,
++			 (havepartition ? arg3.s : NULL));
++	    /*	snmp_increment(XFER_COUNT, 1);*/
++	    }
++	    else goto badcmd;
++	    break;
++
++	default:
++	badcmd:
++	    prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag.s);
++	    eatline(imapd_in, c);
++	}
++
++	continue;
++
++    nologin:
++	prot_printf(imapd_out, "%s BAD Please login first\r\n", tag.s);
++	eatline(imapd_in, c);
++	continue;
++
++    nomailbox:
++	prot_printf(imapd_out, "%s BAD Please select a mailbox first\r\n", tag.s);
++	eatline(imapd_in, c);
++	continue;
++
++    missingargs:
++	prot_printf(imapd_out, "%s BAD Missing required argument to %s\r\n", tag.s, cmd.s);
++	eatline(imapd_in, c);
++	continue;
++
++    extraargs:
++	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to %s\r\n", tag.s, cmd.s);
++	eatline(imapd_in, c);
++	continue;
++
++    badsequence:
++	prot_printf(imapd_out, "%s BAD Invalid sequence in %s\r\n", tag.s, cmd.s);
++	eatline(imapd_in, c);
++	continue;
++
++    badpartition:
++	prot_printf(imapd_out, "%s BAD Invalid partition name in %s\r\n",
++	       tag.s, cmd.s);
++	eatline(imapd_in, c);
++	continue;
++    }
++}
++
++/*
++ * Perform a LOGIN command
++ */
++void cmd_login(char *tag, char *user)
++{
++    char userbuf[MAX_MAILBOX_NAME+1];
++    unsigned userlen;
++    const char *canon_user = userbuf;
++    char c;
++    struct buf passwdbuf;
++    char *passwd;
++    const char *reply = NULL;
++    int r;
++    
++    if (imapd_userid) {
++	eatline(imapd_in, ' ');
++	prot_printf(imapd_out, "%s BAD Already logged in\r\n", tag);
++	return;
++    }
++
++    r = imapd_canon_user(imapd_saslconn, NULL, user, 0,
++			 SASL_CU_AUTHID | SASL_CU_AUTHZID, NULL,
++			 userbuf, sizeof(userbuf), &userlen);
++
++    if (r) {
++	syslog(LOG_NOTICE, "badlogin: %s plaintext %s invalid user",
++	       imapd_clienthost, beautify_string(user));
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, 
++		    error_message(IMAP_INVALID_USER));
++	return;
++    }
++
++    /* possibly disallow login */
++    if ((imapd_starttls_done == 0) &&
++	(config_getswitch(IMAPOPT_ALLOWPLAINTEXT) == 0) &&
++	!is_userid_anonymous(canon_user)) {
++	eatline(imapd_in, ' ');
++	prot_printf(imapd_out, "%s NO Login only available under a layer\r\n",
++		    tag);
++	return;
++    }
++
++    memset(&passwdbuf,0,sizeof(struct buf));
++    c = getastring(imapd_in, imapd_out, &passwdbuf);
++
++    if(c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	freebuf(&passwdbuf);
++	prot_printf(imapd_out,
++		    "%s BAD Unexpected extra arguments to LOGIN\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    passwd = passwdbuf.s;
++
++    if (is_userid_anonymous(canon_user)) {
++	if (config_getswitch(IMAPOPT_ALLOWANONYMOUSLOGIN)) {
++	    passwd = beautify_string(passwd);
++	    if (strlen(passwd) > 500) passwd[500] = '\0';
++	    syslog(LOG_NOTICE, "login: %s anonymous %s",
++		   imapd_clienthost, passwd);
++	    reply = "Anonymous access granted";
++	    imapd_userid = xstrdup("anonymous");
++	}
++	else {
++	    syslog(LOG_NOTICE, "badlogin: %s anonymous login refused",
++		   imapd_clienthost);
++	    prot_printf(imapd_out, "%s NO %s\r\n", tag,
++		   error_message(IMAP_ANONYMOUS_NOT_PERMITTED));
++	    freebuf(&passwdbuf);
++	    return;
++	}
++    }
++    else if ((r = sasl_checkpass(imapd_saslconn,
++				 canon_user,
++				 strlen(canon_user),
++				 passwd,
++				 strlen(passwd))) != SASL_OK) {
++	syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
++	       imapd_clienthost, canon_user, sasl_errdetail(imapd_saslconn));
++
++	sleep(3);
++
++	if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
++	    prot_printf(imapd_out, "%s NO Login failed: %s\r\n", tag, reply);
++	} else {
++	    prot_printf(imapd_out, "%s NO Login failed: %d\r\n", tag, r);
++	}
++
++	snmp_increment_args(AUTHENTICATION_NO, 1,
++			    VARIABLE_AUTH, 0 /* hash_simple("LOGIN") */,
++			    VARIABLE_LISTEND);
++    	freebuf(&passwdbuf);
++	return;
++    }
++    else {
++	r = sasl_getprop(imapd_saslconn, SASL_USERNAME,
++			 (const void **) &canon_user);
++
++	if(r != SASL_OK) {
++	    if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
++		prot_printf(imapd_out, "%s NO Login failed: %s\r\n",
++			    tag, reply);
++	    } else {
++		prot_printf(imapd_out, "%s NO Login failed: %d\r\n", tag, r);
++	    }
++
++	    snmp_increment_args(AUTHENTICATION_NO, 1,
++				VARIABLE_AUTH, 0 /* hash_simple("LOGIN") */,
++				VARIABLE_LISTEND);
++	    freebuf(&passwdbuf);
++	    return;
++	}
++
++	reply = "User logged in";
++	imapd_userid = xstrdup(canon_user);
++	snmp_increment_args(AUTHENTICATION_YES, 1,
++			    VARIABLE_AUTH, 0 /*hash_simple("LOGIN") */, 
++			    VARIABLE_LISTEND);
++	syslog(LOG_NOTICE, "login: %s %s%s plaintext%s %s", imapd_clienthost,
++	       imapd_userid, imapd_magicplus ? imapd_magicplus : "",
++	       imapd_starttls_done ? "+TLS" : "", 
++	       reply ? reply : "");
++
++	/* Apply penalty only if not under layer */
++	if (!imapd_starttls_done) {
++	    int plaintextloginpause = config_getint(IMAPOPT_PLAINTEXTLOGINPAUSE);
++	    if (plaintextloginpause) {
++		sleep(plaintextloginpause);
++	    }
++
++	    /* Fetch plaintext login nag message */
++	    plaintextloginalert = config_getstring(IMAPOPT_PLAINTEXTLOGINALERT);
++	}
++    }
++    
++    imapd_authstate = auth_newstate(imapd_userid);
++
++    imapd_userisadmin = global_authisa(imapd_authstate, IMAPOPT_ADMINS);
++
++    prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
++
++    /* Create telemetry log */
++    imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
++
++    /* Set namespace */
++    if ((r = mboxname_init_namespace(&imapd_namespace,
++				     imapd_userisadmin || imapd_userisproxyadmin)) != 0) {
++	syslog(LOG_ERR, error_message(r));
++	fatal(error_message(r), EC_CONFIG);
++    }
++
++    /* Translate any separators in userid */
++    mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid,
++				config_virtdomains ?
++				strcspn(imapd_userid, "@") : 0);
++
++    freebuf(&passwdbuf);
++    return;
++}
++
++/*
++ * Perform an AUTHENTICATE command
++ */
++void
++cmd_authenticate(char *tag, char *authtype, char *resp)
++{
++    int sasl_result;
++    
++    const int *ssfp;
++    char *ssfmsg=NULL;
++
++    const char *canon_user;
++
++    int r;
++
++    r = saslserver(imapd_saslconn, authtype, resp, "", "+ ", "",
++		   imapd_in, imapd_out, &sasl_result, NULL);
++
++    if (r) {
++	const char *errorstring = NULL;
++
++	switch (r) {
++	case IMAP_SASL_CANCEL:
++	    prot_printf(imapd_out,
++			"%s BAD Client canceled authentication\r\n", tag);
++	    break;
++	case IMAP_SASL_PROTERR:
++	    errorstring = prot_error(imapd_in);
++
++	    prot_printf(imapd_out,
++			"%s NO Error reading client response: %s\r\n",
++			tag, errorstring ? errorstring : "");
++	    break;
++	default: 
++	    /* failed authentication */
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
++
++	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
++		   imapd_clienthost, authtype, sasl_errdetail(imapd_saslconn));
++
++	    snmp_increment_args(AUTHENTICATION_NO, 1,
++				VARIABLE_AUTH, 0, /* hash_simple(authtype) */ 
++				VARIABLE_LISTEND);
++	    sleep(3);
++
++	    if (errorstring) {
++		prot_printf(imapd_out, "%s NO %s\r\n", tag, errorstring);
++	    } else {
++		prot_printf(imapd_out, "%s NO Error authenticating\r\n", tag);
++	    }
++	}
++
++	reset_saslconn(&imapd_saslconn);
++	return;
++    }
++
++    /* successful authentication */
++
++    /* get the userid from SASL --- already canonicalized from
++     * mysasl_proxy_policy()
++     */
++    sasl_result = sasl_getprop(imapd_saslconn, SASL_USERNAME,
++			       (const void **) &canon_user);
++    if (sasl_result != SASL_OK) {
++	prot_printf(imapd_out, "%s NO weird SASL error %d SASL_USERNAME\r\n", 
++		    tag, sasl_result);
++	syslog(LOG_ERR, "weird SASL error %d getting SASL_USERNAME", 
++	       sasl_result);
++	reset_saslconn(&imapd_saslconn);
++	return;
++    }
++
++    /* If we're proxying, the authzid may contain a magic plus,
++       so re-canonify it */
++    if (config_getswitch(IMAPOPT_IMAPMAGICPLUS) && strchr(canon_user, '+')) {
++	char userbuf[MAX_MAILBOX_NAME+1];
++	unsigned userlen;
++
++	sasl_result = imapd_canon_user(imapd_saslconn, NULL, canon_user, 0,
++				       SASL_CU_AUTHID | SASL_CU_AUTHZID,
++				       NULL, userbuf, sizeof(userbuf), &userlen);
++	if (sasl_result != SASL_OK) {
++	    prot_printf(imapd_out, 
++			"%s NO SASL canonification error %d\r\n", 
++			tag, sasl_result);
++	    reset_saslconn(&imapd_saslconn);
++	    return;
++	}
++
++	imapd_userid = xstrdup(userbuf);
++    } else {
++	imapd_userid = xstrdup(canon_user);
++    }
++
++    proc_register("imapd", imapd_clienthost, imapd_userid, (char *)0);
++
++    syslog(LOG_NOTICE, "login: %s %s%s %s%s %s", imapd_clienthost,
++	   imapd_userid, imapd_magicplus ? imapd_magicplus : "",
++	   authtype, imapd_starttls_done ? "+TLS" : "", "User logged in");
++
++    sasl_getprop(imapd_saslconn, SASL_SSF, (const void **) &ssfp);
++
++    /* really, we should be doing a sasl_getprop on SASL_SSF_EXTERNAL,
++       but the current libsasl doesn't allow that. */
++    if (imapd_starttls_done) {
++	switch(*ssfp) {
++	case 0: ssfmsg = "tls protection"; break;
++	case 1: ssfmsg = "tls plus integrity protection"; break;
++	default: ssfmsg = "tls plus privacy protection"; break;
++	}
++    } else {
++	switch(*ssfp) {
++	case 0: ssfmsg = "no protection"; break;
++	case 1: ssfmsg = "integrity protection"; break;
++	default: ssfmsg = "privacy protection"; break;
++	}
++    }
++
++    snmp_increment_args(AUTHENTICATION_YES, 1,
++			VARIABLE_AUTH, 0, /* hash_simple(authtype) */
++			VARIABLE_LISTEND);
++
++    prot_printf(imapd_out, "%s OK Success (%s)\r\n", tag, ssfmsg);
++
++    prot_setsasl(imapd_in,  imapd_saslconn);
++    prot_setsasl(imapd_out, imapd_saslconn);
++
++    /* Create telemetry log */
++    imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
++
++    /* Set namespace */
++    if ((r = mboxname_init_namespace(&imapd_namespace,
++				     imapd_userisadmin || imapd_userisproxyadmin)) != 0) {
++	syslog(LOG_ERR, error_message(r));
++	fatal(error_message(r), EC_CONFIG);
++    }
++
++    /* Translate any separators in userid */
++    mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid,
++				config_virtdomains ?
++				strcspn(imapd_userid, "@") : 0);
++
++    return;
++}
++
++/*
++ * Perform a NOOP command
++ */
++void
++cmd_noop(char *tag, char *cmd __attribute__((unused)))
++{
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 1);
++    }
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Parse and perform an ID command.
++ *
++ * the command has been parsed up to the parameter list.
++ *
++ * we only allow one ID in non-authenticated state from a given client.
++ * we only allow MAXIDFAILED consecutive failed IDs from a given client.
++ * we only record MAXIDLOG ID responses from a given client.
++ */
++void cmd_id(char *tag)
++{
++    static int did_id = 0;
++    static int failed_id = 0;
++    static int logged_id = 0;
++    int error = 0;
++    int c = EOF, npair = 0;
++    static struct buf arg, field;
++    struct attvaluelist *params = 0;
++
++    /* check if we've already had an ID in non-authenticated state */
++    if (!imapd_userid && did_id) {
++	prot_printf(imapd_out,
++		    "%s NO Only one Id allowed in non-authenticated state\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /* check if we've had too many failed IDs in a row */
++    if (failed_id >= MAXIDFAILED) {
++	prot_printf(imapd_out, "%s NO Too many (%u) invalid Id commands\r\n",
++		    tag, failed_id);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /* ok, accept parameter list */
++    c = getword(imapd_in, &arg);
++    /* check for "NIL" or start of parameter list */
++    if (strcasecmp(arg.s, "NIL") && c != '(') {
++	prot_printf(imapd_out, "%s BAD Invalid parameter list in Id\r\n", tag);
++	eatline(imapd_in, c);
++	failed_id++;
++	return;
++    }
++
++    /* parse parameter list */
++    if (c == '(') {
++	for (;;) {
++	    if (c == ')') {
++		/* end of string/value pairs */
++		break;
++	    }
++
++	    /* get field name */
++	    c = getstring(imapd_in, imapd_out, &field);
++	    if (c != ' ') {
++		prot_printf(imapd_out,
++			    "%s BAD Invalid/missing field name in Id\r\n",
++			    tag);
++		error = 1;
++		break;
++	    }
++
++	    /* get field value */
++	    c = getnstring(imapd_in, imapd_out, &arg);
++	    if (c != ' ' && c != ')') {
++		prot_printf(imapd_out,
++			    "%s BAD Invalid/missing value in Id\r\n",
++			    tag);
++		error = 1;
++		break;
++	    }
++
++	    /* ok, we're anal, but we'll still process the ID command */
++	    if (strlen(field.s) > MAXIDFIELDLEN) {
++		prot_printf(imapd_out, 
++			    "%s BAD field longer than %u octets in Id\r\n",
++			    tag, MAXIDFIELDLEN);
++		error = 1;
++		break;
++	    }
++	    if (strlen(arg.s) > MAXIDVALUELEN) {
++		prot_printf(imapd_out,
++			    "%s BAD value longer than %u octets in Id\r\n",
++			    tag, MAXIDVALUELEN);
++		error = 1;
++		break;
++	    }
++	    if (++npair > MAXIDPAIRS) {
++		prot_printf(imapd_out,
++			    "%s BAD too many (%u) field-value pairs in ID\r\n",
++			    tag, MAXIDPAIRS);
++		error = 1;
++		break;
++	    }
++	    
++	    /* ok, we're happy enough */
++	    appendattvalue(&params, field.s, arg.s);
++	}
++
++	if (error || c != ')') {
++	    /* erp! */
++	    eatline(imapd_in, c);
++	    freeattvalues(params);
++	    failed_id++;
++	    return;
++	}
++	c = prot_getc(imapd_in);
++    }
++
++    /* check for CRLF */
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out,
++		    "%s BAD Unexpected extra arguments to Id\r\n", tag);
++	eatline(imapd_in, c);
++	freeattvalues(params);
++	failed_id++;
++	return;
++    }
++
++    /* log the client's ID string.
++       eventually this should be a callback or something. */
++    if (npair && logged_id < MAXIDLOG) {
++	char logbuf[MAXIDLOGLEN + 1] = "";
++	struct attvaluelist *pptr;
++
++	for (pptr = params; pptr; pptr = pptr->next) {
++	    /* should we check for and format literals here ??? */
++	    snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
++		     " \"%s\" ", pptr->attrib);
++	    if (!strcmp(pptr->value, "NIL"))
++		snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
++			 "NIL");
++	    else
++		snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
++			"\"%s\"", pptr->value);
++	}
++
++	syslog(LOG_INFO, "client id:%s", logbuf);
++
++	logged_id++;
++    }
++
++    freeattvalues(params);
++
++    /* spit out our ID string.
++       eventually this might be configurable. */
++    if (config_getswitch(IMAPOPT_IMAPIDRESPONSE)) {
++	id_response(imapd_out);
++	prot_printf(imapd_out, ")\r\n");
++    }
++    else
++	prot_printf(imapd_out, "* ID NIL\r\n");
++
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++
++    failed_id = 0;
++    did_id = 1;
++}
++
++/*
++ * Perform an IDLE command
++ */
++void cmd_idle(char *tag)
++{
++    int c;
++    static struct buf arg;
++
++    /* Setup for doing mailbox updates */
++    if (!idle_init(idle_update)) {
++	prot_printf(imapd_out, 
++		    "%s NO cannot start idling\r\n", tag);
++	return;
++    }
++
++    /* Tell client we are idling and waiting for end of command */
++    prot_printf(imapd_out, "+ idling\r\n");
++    prot_flush(imapd_out);
++
++    /* Start doing mailbox updates */
++    if (imapd_mailbox) index_check(imapd_mailbox, 0, 1);
++    idle_start(imapd_mailbox);
++
++    /* Get continuation data */
++    c = getword(imapd_in, &arg);
++
++    /* Stop updates and do any necessary cleanup */
++    idle_done(imapd_mailbox);
++
++    if (imapd_mailbox) index_check(imapd_mailbox, 0, 1);
++
++    if (c != EOF) {
++	if (!strcasecmp(arg.s, "Done") &&
++	    (c = (c == '\r') ? prot_getc(imapd_in) : c) == '\n') {
++	    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++			error_message(IMAP_OK_COMPLETED));
++	}
++
++	else {
++	    prot_printf(imapd_out, 
++			"%s BAD Invalid Idle continuation\r\n", tag);
++	    eatline(imapd_in, c);
++	}
++    }
++
++    return;
++}
++
++/* Send unsolicited untagged responses to the client */
++void idle_update(idle_flags_t flags)
++{
++    if ((flags & IDLE_MAILBOX) && imapd_mailbox)
++	index_check(imapd_mailbox, 0, 1);
++
++    if (flags & IDLE_ALERT) {
++	char shut[1024];
++	if (! imapd_userisadmin && shutdown_file(shut, sizeof(shut))) {
++	    char *p;
++	    for (p = shut; *p == '['; p++); /* can't have [ be first char */
++	    prot_printf(imapd_out, "* BYE [ALERT] %s\r\n", p);
++	    shut_down(0);
++	}
++    }
++
++    prot_flush(imapd_out);
++}
++
++/*
++ * Perform a CAPABILITY command
++ */
++void cmd_capability(char *tag)
++{
++    const char *sasllist; /* the list of SASL mechanisms */
++    unsigned mechcount;
++
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 0);
++    }
++    prot_printf(imapd_out, "* CAPABILITY " CAPABILITY_STRING);
++
++    if (idle_enabled()) {
++	prot_printf(imapd_out, " IDLE");
++    }
++
++    if (tls_enabled() && !imapd_starttls_done && !imapd_authstate) {
++	prot_printf(imapd_out, " STARTTLS");
++    }
++    if (imapd_authstate ||
++	(!imapd_starttls_done && !config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
++	prot_printf(imapd_out, " LOGINDISABLED");
++    }
++
++    if(config_mupdate_server) {
++	prot_printf(imapd_out, " MUPDATE=mupdate://%s/", config_mupdate_server);
++    }
++
++    /* add the SASL mechs */
++    if (!imapd_authstate &&
++	sasl_listmech(imapd_saslconn, NULL, 
++		      "AUTH=", " AUTH=", " SASL-IR",
++		      &sasllist,
++		      NULL, &mechcount) == SASL_OK && mechcount > 0) {
++	prot_printf(imapd_out, " %s", sasllist);      
++    } else {
++	/* else don't show anything */
++    }
++
++#ifdef ENABLE_LISTEXT
++    prot_printf(imapd_out, " LISTEXT LIST-SUBSCRIBED");
++#endif /* ENABLE_LISTEXT */
++
++#ifdef ENABLE_X_NETSCAPE_HACK
++    prot_printf(imapd_out, " X-NETSCAPE");
++#endif
++    prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Parse and perform an APPEND command.
++ * The command has been parsed up to and including
++ * the mailbox name.
++ */
++static int isokflag(char *s)
++{
++    if (s[0] == '\\') {
++	lcase(s);
++	if (!strcmp(s, "\\seen")) return 1;
++	if (!strcmp(s, "\\answered")) return 1;
++	if (!strcmp(s, "\\flagged")) return 1;
++	if (!strcmp(s, "\\draft")) return 1;
++	if (!strcmp(s, "\\deleted")) return 1;
++	
++	/* uh oh, system flag i don't recognize */
++	return 0;
++    } else {
++	/* valid user flag? */
++	return imparse_isatom(s);
++    }
++}
++
++#define FLAGGROW 10
++void cmd_append(char *tag, char *name)
++
++{
++    int c;
++    static struct buf arg;
++    char *p;
++    time_t now = time(NULL);
++    unsigned size, totalsize = 0;
++    int sawdigit = 0;
++    int isnowait = 0;
++    int r, i;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    struct appendstate mailbox;
++    unsigned long uidvalidity;
++    unsigned long firstuid, num;
++    long doappenduid = 0;
++    const char *parseerr = NULL;
++    FILE *f;
++    int numalloc = 5;
++    struct appendstage *curstage;
++
++    /* See if we can append */
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++    if (!r) {
++	r = append_check(mailboxname, MAILBOX_FORMAT_NORMAL,
++			 imapd_authstate, ACL_INSERT, totalsize);
++    }
++    if (r) {
++	eatline(imapd_in, ' ');
++	prot_printf(imapd_out, "%s NO %s%s\r\n",
++		    tag,
++		    (r == IMAP_MAILBOX_NONEXISTENT &&
++		     mboxlist_createmailboxcheck(mailboxname, 0, 0,
++						 imapd_userisadmin,
++						 imapd_userid, imapd_authstate,
++						 (char **)0, (char **)0) == 0)
++		    ? "[TRYCREATE] " : "", error_message(r));
++	return;
++    }
++
++    stage = xmalloc(numalloc * sizeof(struct appendstage *));
++
++    c = ' '; /* just parsed a space */
++    /* we loop, to support MULTIAPPEND */
++    while (!r && c == ' ') {
++	/* Grow the stage array, if necessary */
++	if (numstage == numalloc) {
++	    /* Avoid integer wrap as arg to xrealloc */
++	    if (numalloc > INT_MAX/(2*sizeof(struct appendstage *)))
++		goto done;
++	    numalloc *= 2;
++	    stage = xrealloc(stage, numalloc * sizeof(struct appendstage *));
++	}
++	curstage = stage[numstage] = xzmalloc(sizeof(struct appendstage));
++	numstage++;
++	/* Parse flags */
++	c = getword(imapd_in, &arg);
++	if  (c == '(' && !arg.s[0]) {
++	    curstage->nflags = 0;
++	    do {
++		c = getword(imapd_in, &arg);
++		if (!curstage->nflags && !arg.s[0] && c == ')') break; /* empty list */
++		if (!isokflag(arg.s)) {
++		    parseerr = "Invalid flag in Append command";
++		    r = IMAP_PROTOCOL_ERROR;
++		    goto done;
++		}
++		if (curstage->nflags == curstage->flagalloc) {
++		    curstage->flagalloc += FLAGGROW;
++		    curstage->flag =
++			(char **) xrealloc((char *) curstage->flag, 
++					   curstage->flagalloc * sizeof(char *));
++		}
++		curstage->flag[curstage->nflags] = xstrdup(arg.s);
++		curstage->nflags++;
++	    } while (c == ' ');
++	    if (c != ')') {
++		parseerr = 
++		    "Missing space or ) after flag name in Append command";
++		r = IMAP_PROTOCOL_ERROR;
++		goto done;
++	    }
++	    c = prot_getc(imapd_in);
++	    if (c != ' ') {
++		parseerr = "Missing space after flag list in Append command";
++		r = IMAP_PROTOCOL_ERROR;
++		goto done;
++	    }
++	    c = getword(imapd_in, &arg);
++	}
++
++	/* Parse internaldate */
++	if (c == '\"' && !arg.s[0]) {
++	    prot_ungetc(c, imapd_in);
++	    c = getdatetime(&(curstage->internaldate));
++	    if (c != ' ') {
++		parseerr = "Invalid date-time in Append command";
++		r = IMAP_PROTOCOL_ERROR;
++		goto done;
++	    }
++	    c = getword(imapd_in, &arg);
++	} else {
++	    curstage->internaldate = now;
++	}
++
++	p = arg.s;
++	/* Check for literal8 */
++	if (*p == '~') {
++	    p++;
++	    /* We don't support binary append yet */
++	    r = IMAP_NO_UNKNOWN_CTE;
++	    goto done;
++	}
++	if (*p != '{') {
++	    parseerr = "Missing required argument to Append command";
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
++	
++	/* Read size from literal */
++	isnowait = 0;
++	size = 0;
++	for (++p; *p && isdigit((int) *p); p++) {
++	    sawdigit++;
++	    size = size*10 + *p - '0';
++#if 0
++            if (size < 0) {
++                lose();
++            }
++#endif
++	}
++	if (*p == '+') {
++	    isnowait++;
++	    p++;
++	}
++	
++	if (c == '\r') {
++	    c = prot_getc(imapd_in);
++	}
++	else {
++	    prot_ungetc(c, imapd_in);
++	    c = ' ';		/* Force a syntax error */
++	}
++	
++	if (*p != '}' || p[1] || c != '\n' || !sawdigit) {
++	    parseerr = "Invalid literal in Append command";
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
++
++	if (!isnowait) {
++	    /* Tell client to send the message */
++	    prot_printf(imapd_out, "+ go ahead\r\n");
++	    prot_flush(imapd_out);
++	}
++	
++	/* Stage the message */
++	f = append_newstage(mailboxname, now, numstage, &(curstage->stage));
++	if (f) {
++	    totalsize += size;
++	    r = message_copy_strict(imapd_in, f, size);
++	    fclose(f);
++	} else {
++	    r = IMAP_IOERROR;
++	}
++	
++	/* if we see a SP, we're trying to append more than one message */
++
++	/* Parse newline terminating command */
++	c = prot_getc(imapd_in);
++    }
++
++ done:
++    if (r) {
++	eatline(imapd_in, c);
++    } else {
++	/* we should be looking at the end of the line */
++	if (c == '\r') c = prot_getc(imapd_in);
++	if (c != '\n') {
++	    parseerr = "junk after literal";
++	    r = IMAP_PROTOCOL_ERROR;
++	    eatline(imapd_in, c);
++	}
++    }
++
++    /* Append from the stage(s) */
++    if (!r) {
++	r = append_setup(&mailbox, mailboxname, MAILBOX_FORMAT_NORMAL,
++			 imapd_userid, imapd_authstate, ACL_INSERT, totalsize);
++    }
++    if (!r) {
++	doappenduid = (mailbox.m.myrights & ACL_READ);
++
++	for (i = 0; !r && i < numstage; i++) {
++	    r = append_fromstage(&mailbox, stage[i]->stage, stage[i]->internaldate, 
++				 (const char **) stage[i]->flag, stage[i]->nflags, 0);
++	}
++
++	if (!r) {
++	    r = append_commit(&mailbox, totalsize, &uidvalidity, &firstuid, &num);
++	} else {
++	    append_abort(&mailbox);
++	}
++    }
++
++    /* Cleanup the stage(s) */
++    while (numstage) {
++	curstage = stage[--numstage];
++
++	append_removestage(curstage->stage);
++	while (curstage->nflags--) {
++	    free(curstage->flag[curstage->nflags]);
++	}
++	if (curstage->flag) free((char *) curstage->flag);
++	free(curstage);
++    }
++    if (stage) free(stage);
++    stage = NULL;
++
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 0);
++    }
++
++    if (r == IMAP_PROTOCOL_ERROR && parseerr) {
++	prot_printf(imapd_out, "%s BAD %s\r\n", tag, parseerr);
++    } else if (r) {
++	prot_printf(imapd_out, "%s NO %s%s\r\n",
++		    tag,
++		    (r == IMAP_MAILBOX_NONEXISTENT &&
++		     mboxlist_createmailboxcheck(mailboxname, 0, 0,
++						 imapd_userisadmin,
++						 imapd_userid, imapd_authstate,
++						 (char **)0, (char **)0) == 0)
++		    ? "[TRYCREATE] " : "", error_message(r));
++    } else if (doappenduid) {
++	prot_printf(imapd_out, "%s OK [APPENDUID %lu", tag, uidvalidity);
++	if (num == 1) {
++	    prot_printf(imapd_out, " %lu", firstuid);
++	} else {
++	    prot_printf(imapd_out, " %lu:%lu", firstuid, firstuid + num - 1);
++	}
++	prot_printf(imapd_out, "] %s\r\n", error_message(IMAP_OK_COMPLETED));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}
++
++/*
++ * Perform a SELECT/EXAMINE/BBOARD command
++ */
++void cmd_select(char *tag, char *cmd, char *name)
++{
++    struct mailbox mailbox;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int r = 0;
++    double usage;
++    int doclose = 0;
++    static char lastqr[MAX_MAILBOX_PATH+1] = "";
++    static time_t nextalert = 0;
++
++    if (imapd_mailbox) {
++	index_closemailbox(imapd_mailbox);
++	mailbox_close(imapd_mailbox);
++	imapd_mailbox = 0;
++    }
++
++    if (cmd[0] == 'B') {
++	/* BBoard namespace is empty */
++	r = IMAP_MAILBOX_NONEXISTENT;
++    }
++    else {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, NULL, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	r = mailbox_open_header(mailboxname, imapd_authstate, &mailbox);
++    }
++
++    if (!r) {
++	doclose = 1;
++	r = mailbox_open_index(&mailbox);
++    }
++    if (!r && !(mailbox.myrights & ACL_READ)) {
++	r = (imapd_userisadmin || (mailbox.myrights & ACL_LOOKUP)) ?
++	  IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++    }
++    if (!r && chdir(mailbox.path)) {
++	syslog(LOG_ERR, "IOERROR: changing directory to %s: %m", mailbox.path);
++	r = IMAP_IOERROR;
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	if (doclose) mailbox_close(&mailbox);
++	return;
++    }
++
++    mboxstruct = mailbox;
++    imapd_mailbox = &mboxstruct;
++
++    index_newmailbox(imapd_mailbox, cmd[0] == 'E');
++
++    /* Examine command puts mailbox in read-only mode */
++    if (cmd[0] == 'E') {
++	imapd_mailbox->myrights &= ~(ACL_SEEN|ACL_WRITE|ACL_DELETE);
++    }
++
++    if (imapd_mailbox->myrights & ACL_DELETE) {
++	time_t now = time(NULL);
++
++	/* Warn if mailbox is close to or over quota */
++	r = quota_read(&imapd_mailbox->quota, NULL, 0);
++	if (!r && imapd_mailbox->quota.limit > 0 &&
++	    (strcmp(imapd_mailbox->quota.root, lastqr) || now > nextalert)) {
++ 	    /* Warn if the following possibilities occur:
++ 	     * - quotawarnkb not set + quotawarn hit
++	     * - quotawarnkb set larger than mailbox + quotawarn hit
++ 	     * - quotawarnkb set + hit + quotawarn hit
++ 	     */
++ 	    int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
++ 	    if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
++ 	        (int)((imapd_mailbox->quota.limit * QUOTA_UNITS) -
++		      imapd_mailbox->quota.used) < (warnsize * QUOTA_UNITS)) {
++		usage = ((double) imapd_mailbox->quota.used * 100.0) / (double)
++		    (imapd_mailbox->quota.limit * QUOTA_UNITS);
++		if (usage >= 100.0) {
++		    prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
++				error_message(IMAP_NO_OVERQUOTA));
++		}
++		else if (usage > config_getint(IMAPOPT_QUOTAWARN)) {
++		    int usageint = (int) usage;
++		    prot_printf(imapd_out, "* NO [ALERT] ");
++		    prot_printf(imapd_out, error_message(IMAP_NO_CLOSEQUOTA),
++				usageint);
++		    prot_printf(imapd_out, "\r\n");
++		}
++	    }
++	    strlcpy(lastqr, imapd_mailbox->quota.root, sizeof(lastqr));
++	    nextalert = now + 600; /* ALERT every 10 min regardless */
++	}
++    }
++
++    prot_printf(imapd_out, "%s OK [READ-%s] %s\r\n", tag,
++	   (imapd_mailbox->myrights & (ACL_WRITE|ACL_DELETE)) ?
++		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
++
++    proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
++    syslog(LOG_DEBUG, "open: user %s opened %s", imapd_userid, name);
++}
++	  
++/*
++ * Perform a CLOSE command
++ */
++void
++cmd_close(tag)
++char *tag;
++{
++    int r;
++
++    if (!(imapd_mailbox->myrights & ACL_DELETE)) r = 0;
++    else {
++	r = mailbox_expunge(imapd_mailbox, 1, (int (*)())0, (char *)0);
++    }
++
++    index_closemailbox(imapd_mailbox);
++    mailbox_close(imapd_mailbox);
++    imapd_mailbox = 0;
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}    
++
++/*
++ * Perform an UNSELECT command -- for some support of IMAP proxy.
++ * Just like close except no expunge.
++ */
++void
++cmd_unselect(tag)
++char* tag;
++{
++    index_closemailbox(imapd_mailbox);
++    mailbox_close(imapd_mailbox);
++    imapd_mailbox = 0;
++
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Parse the syntax for a partial fetch:
++ *   "<" number "." nz-number ">"
++ */
++#define PARSE_PARTIAL(start_octet, octet_count)			        \
++    (start_octet) = (octet_count) = 0;                                  \
++    if (*p == '<' && isdigit((int) p[1])) {				\
++	(start_octet) = p[1] - '0';				\
++	p += 2;								\
++	while (isdigit((int) *p)) {					\
++	    (start_octet) =					\
++		(start_octet) * 10 + *p++ - '0';		\
++	}								\
++									\
++	if (*p == '.' && p[1] >= '1' && p[1] <= '9') {			\
++	    (octet_count) = p[1] - '0';				\
++	    p[0] = '>'; p[1] = '\0'; /* clip off the octet count 	\
++					(its not used in the reply) */	\
++	    p += 2;							\
++	    while (isdigit((int) *p)) {					\
++		(octet_count) =					\
++		    (octet_count) * 10 + *p++ - '0';		\
++	    }								\
++	}								\
++	else p--;							\
++									\
++	if (*p != '>') {						\
++	    prot_printf(imapd_out,					\
++			"%s BAD Invalid body partial\r\n", tag);	\
++	    eatline(imapd_in, c);					\
++	    goto freeargs;						\
++	}								\
++	p++;								\
++    }
++
++/*
++ * Parse and perform a FETCH/UID FETCH command
++ * The command has been parsed up to and including
++ * the sequence
++ */
++void cmd_fetch(char *tag, char *sequence, int usinguid)
++{
++    char *cmd = usinguid ? "UID Fetch" : "Fetch";
++    static struct buf fetchatt, fieldname;
++    int c;
++    int inlist = 0;
++    int fetchitems = 0;
++    struct fetchargs fetchargs;
++    struct octetinfo oi;
++    struct strlist *newfields = 0;
++    char *p, *section;
++    int fetchedsomething, r;
++    clock_t start = clock();
++    char mytime[100];
++
++    memset(&fetchargs, 0, sizeof(struct fetchargs));
++
++    c = getword(imapd_in, &fetchatt);
++    if (c == '(' && !fetchatt.s[0]) {
++	inlist = 1;
++	c = getword(imapd_in, &fetchatt);
++    }
++    for (;;) {
++	ucase(fetchatt.s);
++	switch (fetchatt.s[0]) {
++	case 'A':
++	    if (!inlist && !strcmp(fetchatt.s, "ALL")) {
++		fetchitems |= FETCH_ALL;
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'B':
++	    if (!strncmp(fetchatt.s, "BINARY[", 7) ||
++		!strncmp(fetchatt.s, "BINARY.PEEK[", 12) ||
++		!strncmp(fetchatt.s, "BINARY.SIZE[", 12)) {
++		int binsize = 0;
++
++		p = section = fetchatt.s + 7;
++		if (!strncmp(p, "PEEK[", 5)) {
++		    p = section += 5;
++		}
++		else if (!strncmp(p, "SIZE[", 5)) {
++		    p = section += 5;
++		    binsize = 1;
++		}
++		else {
++		    fetchitems |= FETCH_SETSEEN;
++		}
++		while ((*p >= '1' && *p <= '9') || *p == '.') {
++		    if (*p == '.' && !isdigit((int) p[-1])) break;
++		    p++;
++		}
++
++		if (*p != ']') {
++		    prot_printf(imapd_out, "%s BAD Invalid body section\r\n", tag);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		p++;
++
++		if (!binsize) PARSE_PARTIAL(oi.start_octet, oi.octet_count);
++
++		if (*p) {
++		    prot_printf(imapd_out, "%s BAD Junk after body section\r\n", tag);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		if (binsize)
++		    appendstrlist_withdata(&fetchargs.sizesections, section, &oi, sizeof(oi));
++		else
++		    appendstrlist_withdata(&fetchargs.binsections, section, &oi, sizeof(oi));
++	    }
++	    else if (!strcmp(fetchatt.s, "BODY")) {
++		fetchitems |= FETCH_BODY;
++	    }
++	    else if (!strcmp(fetchatt.s, "BODYSTRUCTURE")) {
++		fetchitems |= FETCH_BODYSTRUCTURE;
++	    }
++	    else if (!strncmp(fetchatt.s, "BODY[", 5) ||
++		     !strncmp(fetchatt.s, "BODY.PEEK[", 10)) {
++		p = section = fetchatt.s + 5;
++		if (!strncmp(p, "PEEK[", 5)) {
++		    p = section += 5;
++		}
++		else {
++		    fetchitems |= FETCH_SETSEEN;
++		}
++		while (isdigit((int) *p) || *p == '.') {
++		    if (*p == '.' && !isdigit((int) p[-1])) break;
++		    /* Obsolete section 0 can only occur before close brace */
++		    if (*p == '0' && !isdigit((int) p[-1]) && p[1] != ']') break;
++		    p++;
++		}
++
++		if (*p == 'H' && !strncmp(p, "HEADER.FIELDS", 13) &&
++		    (p == section || p[-1] == '.') &&
++		    (p[13] == '\0' || !strcmp(p+13, ".NOT"))) {
++
++		    /*
++		     * If not top-level or a HEADER.FIELDS.NOT, can't pull
++		     * the headers out of the cache.
++		     */
++		    if (p != section || p[13] != '\0') {
++			fetchargs.cache_atleast = BIT32_MAX;
++		    }
++
++		    if (c != ' ') {
++			prot_printf(imapd_out,
++				    "%s BAD Missing required argument to %s %s\r\n",
++				    tag, cmd, fetchatt.s);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++		    c = prot_getc(imapd_in);
++		    if (c != '(') {
++			prot_printf(imapd_out, "%s BAD Missing required open parenthesis in %s %s\r\n",
++				    tag, cmd, fetchatt.s);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++		    do {
++			c = getastring(imapd_in, imapd_out, &fieldname);
++			for (p = fieldname.s; *p; p++) {
++			    if (*p <= ' ' || *p & 0x80 || *p == ':') break;
++			}
++			if (*p || !*fieldname.s) {
++			    prot_printf(imapd_out, "%s BAD Invalid field-name in %s %s\r\n",
++					tag, cmd, fetchatt.s);
++			    eatline(imapd_in, c);
++			    goto freeargs;
++			}
++			appendstrlist(&newfields, fieldname.s);
++			if (fetchargs.cache_atleast < BIT32_MAX) {
++			    bit32 this_ver =
++				mailbox_cached_header(fieldname.s);
++			    if(this_ver > fetchargs.cache_atleast)
++				fetchargs.cache_atleast = this_ver;
++			}
++		    } while (c == ' ');
++		    if (c != ')') {
++			prot_printf(imapd_out, "%s BAD Missing required close parenthesis in %s %s\r\n",
++				    tag, cmd, fetchatt.s);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++
++		    /* Grab/parse the ]<x.y> part */
++		    c = getword(imapd_in, &fieldname);
++		    p = fieldname.s;
++		    if (*p++ != ']') {
++			prot_printf(imapd_out, "%s BAD Missing required close bracket after %s %s\r\n",
++				    tag, cmd, fetchatt.s);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++
++		    PARSE_PARTIAL(oi.start_octet, oi.octet_count);
++
++		    if (*p) {
++			prot_printf(imapd_out, "%s BAD Junk after body section\r\n", tag);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++		    appendfieldlist(&fetchargs.fsections,
++				    section, newfields, fieldname.s,
++				    &oi, sizeof(oi));
++		    newfields = 0;
++		    break;
++		}
++
++		switch (*p) {
++		case 'H':
++		    if (p != section && p[-1] != '.') break;
++		    if (!strncmp(p, "HEADER]", 7)) p += 6;
++		    break;
++
++		case 'M':
++		    if (!strncmp(p-1, ".MIME]", 6)) p += 4;
++		    break;
++
++		case 'T':
++		    if (p != section && p[-1] != '.') break;
++		    if (!strncmp(p, "TEXT]", 5)) p += 4;
++		    break;
++		}
++
++		if (*p != ']') {
++		    prot_printf(imapd_out, "%s BAD Invalid body section\r\n", tag);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		p++;
++
++		PARSE_PARTIAL(oi.start_octet, oi.octet_count);
++
++		if (*p) {
++		    prot_printf(imapd_out, "%s BAD Junk after body section\r\n", tag);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		appendstrlist_withdata(&fetchargs.bodysections, section,
++				       &oi, sizeof(oi));
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'E':
++	    if (!strcmp(fetchatt.s, "ENVELOPE")) {
++		fetchitems |= FETCH_ENVELOPE;
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'F':
++	    if (!inlist && !strcmp(fetchatt.s, "FAST")) {
++		fetchitems |= FETCH_FAST;
++	    }
++	    else if (!inlist && !strcmp(fetchatt.s, "FULL")) {
++		fetchitems |= FETCH_FULL;
++	    }
++	    else if (!strcmp(fetchatt.s, "FLAGS")) {
++		fetchitems |= FETCH_FLAGS;
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'I':
++	    if (!strcmp(fetchatt.s, "INTERNALDATE")) {
++		fetchitems |= FETCH_INTERNALDATE;
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'R':
++	    if (!strcmp(fetchatt.s, "RFC822")) {
++		fetchitems |= FETCH_RFC822|FETCH_SETSEEN;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.HEADER")) {
++		fetchitems |= FETCH_HEADER;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.PEEK")) {
++		fetchitems |= FETCH_RFC822;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.SIZE")) {
++		fetchitems |= FETCH_SIZE;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.TEXT")) {
++		fetchitems |= FETCH_TEXT|FETCH_SETSEEN;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.TEXT.PEEK")) {
++		fetchitems |= FETCH_TEXT;
++	    }
++	    else if (!strcmp(fetchatt.s, "RFC822.HEADER.LINES") ||
++		     !strcmp(fetchatt.s, "RFC822.HEADER.LINES.NOT")) {
++		if (c != ' ') {
++		    prot_printf(imapd_out, "%s BAD Missing required argument to %s %s\r\n",
++			   tag, cmd, fetchatt.s);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		c = prot_getc(imapd_in);
++		if (c != '(') {
++		    prot_printf(imapd_out, "%s BAD Missing required open parenthesis in %s %s\r\n",
++			   tag, cmd, fetchatt.s);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		do {
++		    c = getastring(imapd_in, imapd_out, &fieldname);
++		    for (p = fieldname.s; *p; p++) {
++			if (*p <= ' ' || *p & 0x80 || *p == ':') break;
++		    }
++		    if (*p || !*fieldname.s) {
++			prot_printf(imapd_out, "%s BAD Invalid field-name in %s %s\r\n",
++			       tag, cmd, fetchatt.s);
++			eatline(imapd_in, c);
++			goto freeargs;
++		    }
++		    lcase(fieldname.s);;
++		    /* 19 is magic number -- length of 
++		     * "RFC822.HEADERS.NOT" */
++		    appendstrlist(strlen(fetchatt.s) == 19 ?
++				  &fetchargs.headers : &fetchargs.headers_not,
++				  fieldname.s);
++		    if (strlen(fetchatt.s) != 19) {
++			fetchargs.cache_atleast = BIT32_MAX;
++		    }
++		    if (fetchargs.cache_atleast < BIT32_MAX) {
++			bit32 this_ver =
++			    mailbox_cached_header(fieldname.s);
++			if(this_ver > fetchargs.cache_atleast)
++			    fetchargs.cache_atleast = this_ver;
++		   }
++		} while (c == ' ');
++		if (c != ')') {
++		    prot_printf(imapd_out, "%s BAD Missing required close parenthesis in %s %s\r\n",
++			   tag, cmd, fetchatt.s);
++		    eatline(imapd_in, c);
++		    goto freeargs;
++		}
++		c = prot_getc(imapd_in);
++	    }
++	    else goto badatt;
++	    break;
++
++	case 'U':
++	    if (!strcmp(fetchatt.s, "UID")) {
++		fetchitems |= FETCH_UID;
++	    }
++	    else goto badatt;
++	    break;
++
++	default:
++	badatt:
++	    prot_printf(imapd_out, "%s BAD Invalid %s attribute %s\r\n", tag, cmd, fetchatt.s);
++	    eatline(imapd_in, c);
++	    goto freeargs;
++	}
++
++	if (inlist && c == ' ') c = getword(imapd_in, &fetchatt);
++	else break;
++    }
++    
++    if (inlist && c == ')') {
++	inlist = 0;
++	c = prot_getc(imapd_in);
++    }
++    if (inlist) {
++	prot_printf(imapd_out, "%s BAD Missing close parenthesis in %s\r\n", tag, cmd);
++	eatline(imapd_in, c);
++	goto freeargs;
++    }
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to %s\r\n", tag, cmd);
++	eatline(imapd_in, c);
++	goto freeargs;
++    }
++
++    if (!fetchitems && !fetchargs.bodysections && !fetchargs.fsections &&
++	!fetchargs.binsections && !fetchargs.sizesections &&
++	!fetchargs.headers && !fetchargs.headers_not) {
++	prot_printf(imapd_out, "%s BAD Missing required argument to %s\r\n", tag, cmd);
++	goto freeargs;
++    }
++
++    if (usinguid) {
++	fetchitems |= FETCH_UID;
++	index_check(imapd_mailbox, 1, 0);
++    }
++
++    fetchargs.fetchitems = fetchitems;
++    r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs,
++		&fetchedsomething);
++
++    snprintf(mytime, sizeof(mytime), "%2.3f", 
++	     (clock() - start) / (double) CLOCKS_PER_SEC);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
++		    error_message(r), mytime);
++    } else if (fetchedsomething || usinguid) {
++	prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED), mytime);
++    } else {
++	/* normal FETCH, nothing came back */
++	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
++		    error_message(IMAP_NO_NOSUCHMSG), mytime);
++    }
++
++ freeargs:
++    freestrlist(newfields);
++    freestrlist(fetchargs.bodysections);
++    freefieldlist(fetchargs.fsections);
++    freestrlist(fetchargs.headers);
++    freestrlist(fetchargs.headers_not);
++}
++
++#undef PARSE_PARTIAL /* cleanup */
++
++/*
++ * Perform a PARTIAL command
++ */
++void cmd_partial(const char *tag, const char *msgno, char *data,
++		 const char *start, const char *count)
++{
++    const char *pc;
++    char *p;
++    struct fetchargs fetchargs;
++    char *section;
++    int prev;
++    int fetchedsomething;
++
++    memset(&fetchargs, 0, sizeof(struct fetchargs));
++
++    for (pc = msgno; *pc; pc++) {
++	if (!isdigit((int) *pc)) break;
++    }
++    if (*pc || !*msgno) {
++	prot_printf(imapd_out, "%s BAD Invalid message number\r\n", tag);
++	return;
++    }
++
++    lcase(data);
++    if (!strcmp(data, "rfc822")) {
++	fetchargs.fetchitems = FETCH_RFC822|FETCH_SETSEEN;
++    }
++    else if (!strcmp(data, "rfc822.header")) {
++	fetchargs.fetchitems = FETCH_HEADER;
++    }
++    else if (!strcmp(data, "rfc822.peek")) {
++	fetchargs.fetchitems = FETCH_RFC822;
++    }
++    else if (!strcmp(data, "rfc822.text")) {
++	fetchargs.fetchitems = FETCH_TEXT|FETCH_SETSEEN;
++    }
++    else if (!strcmp(data, "rfc822.text.peek")) {
++	fetchargs.fetchitems = FETCH_TEXT;
++    }
++    else if (!strncmp(data, "body[", 5) ||
++	     !strncmp(data, "body.peek[", 10)) {
++	p = section = data + 5;
++	if (!strncmp(p, "peek[", 5)) {
++	    p = section += 5;
++	}
++	else {
++	    fetchargs.fetchitems = FETCH_SETSEEN;
++	}
++	while (isdigit((int) *p) || *p == '.') {
++	    if (*p == '.' && (p == section || !isdigit((int) p[1]))) break;
++	    p++;
++	}
++	if (p == section || *p != ']' || p[1]) {
++	    prot_printf(imapd_out, "%s BAD Invalid body section\r\n", tag);
++	    freestrlist(fetchargs.bodysections);
++	    return;
++	}
++	*(p+1) = '\0'; /* Keep the closing bracket in place */
++	appendstrlist(&fetchargs.bodysections, section);
++    }
++    else {
++	prot_printf(imapd_out, "%s BAD Invalid Partial item\r\n", tag);
++	freestrlist(fetchargs.bodysections);
++	return;
++    }
++
++    for (pc = start; *pc; pc++) {
++	if (!isdigit((int) *pc)) break;
++	prev = fetchargs.start_octet;
++	fetchargs.start_octet = fetchargs.start_octet*10 + *pc - '0';
++	if(fetchargs.start_octet < prev) {
++	    fetchargs.start_octet = 0;
++	    break;
++	}
++    }
++    if (*pc || !fetchargs.start_octet) {
++	prot_printf(imapd_out, "%s BAD Invalid starting octet\r\n", tag);
++	freestrlist(fetchargs.bodysections);
++	return;
++    }
++    fetchargs.start_octet--;	/* Normalize to be 0-based */
++    
++    prev = fetchargs.octet_count;
++    for (pc = count; *pc; pc++) {
++	if (!isdigit((int) *pc)) break;
++	prev = fetchargs.octet_count;
++	fetchargs.octet_count = fetchargs.octet_count*10 + *pc - '0';
++	if(fetchargs.octet_count < prev) {
++	    prev = -1;
++	    break;
++	}
++    }
++    if (*pc || !*count || prev == -1) {
++	prot_printf(imapd_out, "%s BAD Invalid octet count\r\n", tag);
++	freestrlist(fetchargs.bodysections);
++	return;
++    }
++
++    fetchargs.fetchitems |= FETCH_IS_PARTIAL;
++
++    index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething);
++
++    index_check(imapd_mailbox, 0, 0);
++
++    if (fetchedsomething) {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    } else {
++	prot_printf(imapd_out,
++		    "%s BAD Invalid sequence in PARTIAL command\r\n",
++		    tag);
++    }
++
++    freestrlist(fetchargs.bodysections);
++}
++
++/*
++ * Parse and perform a STORE/UID STORE command
++ * The command has been parsed up to and including
++ * the FLAGS/+FLAGS/-FLAGS
++ */
++void cmd_store(char *tag, char *sequence, char *operation, int usinguid)
++{
++    char *cmd = usinguid ? "UID Store" : "Store";
++    struct storeargs storeargs;
++    static struct buf flagname;
++    int len, c;
++    char **flag = 0;
++    int nflags = 0, flagalloc = 0;
++    int flagsparsed = 0, inlist = 0;
++    int r;
++
++    memset(&storeargs, 0, sizeof storeargs);
++
++    lcase(operation);
++
++    len = strlen(operation);
++    if (len > 7 && !strcmp(operation+len-7, ".silent")) {
++	storeargs.silent = 1;
++	operation[len-7] = '\0';
++    }
++    
++    if (!strcmp(operation, "+flags")) {
++	storeargs.operation = STORE_ADD;
++    }
++    else if (!strcmp(operation, "-flags")) {
++	storeargs.operation = STORE_REMOVE;
++    }
++    else if (!strcmp(operation, "flags")) {
++	storeargs.operation = STORE_REPLACE;
++    }
++    else {
++	prot_printf(imapd_out, "%s BAD Invalid %s attribute\r\n", tag, cmd);
++	eatline(imapd_in, ' ');
++	return;
++    }
++
++    for (;;) {
++	c = getword(imapd_in, &flagname);
++	if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
++	    inlist = 1;
++	    continue;
++	}
++
++	if (!flagname.s[0]) break;
++
++	if (flagname.s[0] == '\\') {
++	    lcase(flagname.s);
++	    if (!strcmp(flagname.s, "\\seen")) {
++		storeargs.seen = 1;
++	    }
++	    else if (!strcmp(flagname.s, "\\answered")) {
++		storeargs.system_flags |= FLAG_ANSWERED;
++	    }
++	    else if (!strcmp(flagname.s, "\\flagged")) {
++		storeargs.system_flags |= FLAG_FLAGGED;
++	    }
++	    else if (!strcmp(flagname.s, "\\deleted")) {
++		storeargs.system_flags |= FLAG_DELETED;
++	    }
++	    else if (!strcmp(flagname.s, "\\draft")) {
++		storeargs.system_flags |= FLAG_DRAFT;
++	    }
++	    else {
++		prot_printf(imapd_out, "%s BAD Invalid system flag in %s command\r\n",
++		       tag, cmd);
++		eatline(imapd_in, c);
++		goto freeflags;
++	    }
++	}
++	else if (!imparse_isatom(flagname.s)) {
++	    prot_printf(imapd_out, "%s BAD Invalid flag name %s in %s command\r\n",
++		   tag, flagname.s, cmd);
++	    eatline(imapd_in, c);
++	    goto freeflags;
++	}
++	else {
++	    if (nflags == flagalloc) {
++		flagalloc += FLAGGROW;
++		flag = (char **)xrealloc((char *)flag,
++					 flagalloc*sizeof(char *));
++	    }
++	    flag[nflags] = xstrdup(flagname.s);
++	    nflags++;
++	}
++
++	flagsparsed++;
++	if (c != ' ') break;
++    }
++
++    if (!inlist && !flagsparsed) {
++	prot_printf(imapd_out, "%s BAD Missing required argument to %s\r\n", tag, cmd);
++	eatline(imapd_in, c);
++	return;
++    }
++    if (inlist && c == ')') {
++	inlist = 0;
++	c = prot_getc(imapd_in);
++    }
++    if (inlist) {
++	prot_printf(imapd_out, "%s BAD Missing close parenthesis in %s\r\n", tag, cmd);
++	eatline(imapd_in, c);
++	goto freeflags;
++    }
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to %s\r\n", tag, cmd);
++	eatline(imapd_in, c);
++	goto freeflags;
++    }
++
++    r = index_store(imapd_mailbox, sequence, usinguid, &storeargs,
++		    flag, nflags);
++
++    if (usinguid) {
++	index_check(imapd_mailbox, 1, 0);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++
++ freeflags:
++    while (nflags--) {
++	free(flag[nflags]);
++    }
++    if (flag) free((char *)flag);
++}
++
++void
++cmd_search(tag, usinguid)
++char *tag;
++int usinguid;
++{
++    int c;
++    int charset = 0;
++    struct searchargs *searchargs;
++    clock_t start = clock();
++    char mytime[100];
++    int n;
++
++    searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++
++    c = getsearchprogram(tag, searchargs, &charset, 1);
++    if (c == EOF) {
++	eatline(imapd_in, ' ');
++	freesearchargs(searchargs);
++	return;
++    }
++
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to Search\r\n", tag);
++	eatline(imapd_in, c);
++	freesearchargs(searchargs);
++	return;
++    }
++
++    if (charset == -1) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag,
++	       error_message(IMAP_UNRECOGNIZED_CHARSET));
++    }
++    else {
++	n = index_search(imapd_mailbox, searchargs, usinguid);
++	snprintf(mytime, sizeof(mytime), "%2.3f", 
++		 (clock() - start) / (double) CLOCKS_PER_SEC);
++	prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED), n, mytime);
++    }
++
++    freesearchargs(searchargs);
++}
++
++/*
++ * Perform a SORT/UID SORT command
++ */    
++void
++cmd_sort(tag, usinguid)
++char *tag;
++int usinguid;
++{
++    int c;
++    struct sortcrit *sortcrit = NULL;
++    static struct buf arg;
++    int charset = 0;
++    struct searchargs *searchargs;
++    clock_t start = clock();
++    char mytime[100];
++    int n;
++
++    c = getsortcriteria(tag, &sortcrit);
++    if (c == EOF) {
++	eatline(imapd_in, ' ');
++	freesortcrit(sortcrit);
++	return;
++    }
++
++    /* get charset */
++    if (c != ' ') {
++	prot_printf(imapd_out, "%s BAD Missing charset in Sort\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	freesortcrit(sortcrit);
++	return;
++    }
++
++    c = getword(imapd_in, &arg);
++    if (c != ' ') {
++	prot_printf(imapd_out, "%s BAD Missing search criteria in Sort\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	freesortcrit(sortcrit);
++	return;
++    }
++    lcase(arg.s);
++    charset = charset_lookupname(arg.s);
++
++    if (charset == -1) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag,
++	       error_message(IMAP_UNRECOGNIZED_CHARSET));
++	eatline(imapd_in, c);
++	freesortcrit(sortcrit);
++	return;
++    }
++
++    searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++
++    c = getsearchprogram(tag, searchargs, &charset, 0);
++    if (c == EOF) {
++	eatline(imapd_in, ' ');
++	freesearchargs(searchargs);
++	freesortcrit(sortcrit);
++	return;
++    }
++
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, 
++		    "%s BAD Unexpected extra arguments to Sort\r\n", tag);
++	eatline(imapd_in, c);
++	freesearchargs(searchargs);
++	freesortcrit(sortcrit);
++	return;
++    }
++
++    n = index_sort(imapd_mailbox, sortcrit, searchargs, usinguid);
++    snprintf(mytime, sizeof(mytime), "%2.3f",
++	     (clock() - start) / (double) CLOCKS_PER_SEC);
++    prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
++		error_message(IMAP_OK_COMPLETED), n, mytime);
++
++    freesortcrit(sortcrit);
++    freesearchargs(searchargs);
++    return;
++}
++
++/*
++ * Perform a THREAD/UID THREAD command
++ */    
++void
++cmd_thread(tag, usinguid)
++char *tag;
++int usinguid;
++{
++    static struct buf arg;
++    int c;
++    int charset = 0;
++    int alg;
++    struct searchargs *searchargs;
++    clock_t start = clock();
++    char mytime[100];
++    int n;
++
++    /* get algorithm */
++    c = getword(imapd_in, &arg);
++    if (c != ' ') {
++	prot_printf(imapd_out, "%s BAD Missing algorithm in Thread\r\n", tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    if ((alg = find_thread_algorithm(arg.s)) == -1) {
++	prot_printf(imapd_out, "%s BAD Invalid Thread algorithm %s\r\n",
++		    tag, arg.s);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /* get charset */
++    c = getword(imapd_in, &arg);
++    if (c != ' ') {
++	prot_printf(imapd_out, "%s BAD Missing charset in Thread\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	return;
++    }
++    lcase(arg.s);
++    charset = charset_lookupname(arg.s);
++
++    if (charset == -1) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag,
++	       error_message(IMAP_UNRECOGNIZED_CHARSET));
++	eatline(imapd_in, c);
++	return;
++    }
++
++    searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++
++    c = getsearchprogram(tag, searchargs, &charset, 0);
++    if (c == EOF) {
++	eatline(imapd_in, ' ');
++	freesearchargs(searchargs);
++	return;
++    }
++
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, 
++		    "%s BAD Unexpected extra arguments to Thread\r\n", tag);
++	eatline(imapd_in, c);
++	freesearchargs(searchargs);
++	return;
++    }
++
++    n = index_thread(imapd_mailbox, alg, searchargs, usinguid);
++    snprintf(mytime, sizeof(mytime), "%2.3f", 
++	     (clock() - start) / (double) CLOCKS_PER_SEC);
++    prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
++		error_message(IMAP_OK_COMPLETED), n, mytime);
++
++    freesearchargs(searchargs);
++    return;
++}
++
++/*
++ * Perform a COPY/UID COPY command
++ */    
++void
++cmd_copy(tag, sequence, name, usinguid)
++char *tag;
++char *sequence;
++char *name;
++int usinguid;
++{
++    int r;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char *copyuid;
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++    if (!r) {
++	r = index_copy(imapd_mailbox, sequence, usinguid, mailboxname,
++		       &copyuid, !config_getswitch(IMAPOPT_SINGLEINSTANCESTORE));
++    }
++
++    index_check(imapd_mailbox, usinguid, 0);
++
++    if (r && !(usinguid && r == IMAP_NO_NOSUCHMSG)) {
++	prot_printf(imapd_out, "%s NO %s%s\r\n", tag,
++		    (r == IMAP_MAILBOX_NONEXISTENT &&
++		     mboxlist_createmailboxcheck(mailboxname, 0, 0,
++						 imapd_userisadmin,
++						 imapd_userid, imapd_authstate,
++						 (char **)0, (char **)0) == 0)
++		    ? "[TRYCREATE] " : "", error_message(r));
++    }
++    else if (copyuid) {
++	    prot_printf(imapd_out, "%s OK [COPYUID %s] %s\r\n", tag,
++			copyuid, error_message(IMAP_OK_COMPLETED));
++	    free(copyuid);
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}    
++
++/*
++ * Perform an EXPUNGE command
++ */
++void
++cmd_expunge(tag, sequence)
++char *tag;
++char *sequence;
++{
++    int r;
++
++    if (!(imapd_mailbox->myrights & ACL_DELETE)) r = IMAP_PERMISSION_DENIED;
++    else if (sequence) {
++	r = mailbox_expunge(imapd_mailbox, 1, index_expungeuidlist, sequence);
++    }
++    else {
++	r = mailbox_expunge(imapd_mailbox, 1, (mailbox_decideproc_t *)0,
++			    (void *)0);
++    }
++
++    index_check(imapd_mailbox, 0, 0);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}    
++
++/*
++ * Perform a CREATE command
++ */
++void
++cmd_create(char *tag, char *name, char *partition, int localonly)
++{
++    int r = 0;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int autocreatequota;
++
++    if (partition && !imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (name[0] && name[strlen(name)-1] == imapd_namespace.hier_sep) {
++	/* We don't care about trailing hierarchy delimiters. */
++	name[strlen(name)-1] = '\0';
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++
++    if (!r) {
++	/* xxx we do forced user creates on LOCALCREATE to facilitate
++	 * mailbox moves */
++	r = mboxlist_createmailbox(mailboxname, 0, partition,
++				   imapd_userisadmin, 
++				   imapd_userid, imapd_authstate,
++				   localonly, localonly, 0);
++
++	if (r == IMAP_PERMISSION_DENIED && !strcasecmp(name, "INBOX") &&
++	    (autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) {
++
++	    /* Auto create */
++	    r = mboxlist_createmailbox(mailboxname, 0,
++				       partition, 1, imapd_userid,
++				       imapd_authstate, 0, 0, 0);
++	    
++	    if (!r && autocreatequota > 0) {
++		(void) mboxlist_setquota(mailboxname, autocreatequota, 0);
++	    }
++	}
++    }
++
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 0);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}	
++
++/* Callback for use by cmd_delete */
++static int delmbox(char *name,
++		   int matchlen __attribute__((unused)),
++		   int maycreate __attribute__((unused)),
++		   void *rock __attribute__((unused)))
++{
++    int r;
++
++    r = mboxlist_deletemailbox(name, imapd_userisadmin,
++			       imapd_userid, imapd_authstate,
++			       0, 0, 0);
++    
++    if(r) {
++	prot_printf(imapd_out, "* NO delete %s: %s\r\n",
++		    name, error_message(r));
++    }
++    
++    return 0;
++}
++
++/*
++ * Perform a DELETE command
++ */
++void cmd_delete(char *tag, char *name, int localonly)
++{
++    int r;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char *p;
++    int domainlen = 0;
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	if (config_virtdomains && (p = strchr(mailboxname, '!')))
++	    domainlen = p - mailboxname + 1;
++
++	r = mboxlist_deletemailbox(mailboxname, imapd_userisadmin,
++				   imapd_userid, imapd_authstate, 1,
++				   localonly, 0);
++    }
++
++    /* was it a top-level user mailbox? */
++    /* localonly deletes are only per-mailbox */
++    if (!r && !localonly &&
++	!strncmp(mailboxname+domainlen, "user.", 5) &&
++	!strchr(mailboxname+domainlen+5, '.')) {
++ 	int mailboxname_len = strlen(mailboxname);
++
++ 	/* If we aren't too close to MAX_MAILBOX_NAME, append .* */
++ 	p = mailboxname + mailboxname_len; /* end of mailboxname */
++ 	if (mailboxname_len < sizeof(mailboxname) - 3) {
++ 	    strcpy(p, ".*");
++ 	}
++	
++	/* build a list of mailboxes - we're using internal names here */
++	mboxlist_findall(NULL, mailboxname, imapd_userisadmin, imapd_userid,
++			 imapd_authstate, delmbox, NULL);
++
++	/* take care of deleting ACLs, subscriptions, seen state and quotas */
++	*p = '\0'; /* clip off pattern */
++	if ((!domainlen) || 
++	    (domainlen+1 < (sizeof(mailboxname) - mailboxname_len))) {
++	    if (domainlen) {
++		/* fully qualify the userid */
++		snprintf(p, (sizeof(mailboxname) - mailboxname_len), "@%.*s", 
++			 domainlen-1, mailboxname);
++	    }
++	    user_deletedata(mailboxname+domainlen+5, imapd_userid,
++			    imapd_authstate, 1);
++	}
++    }
++
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 0);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}	
++
++struct renrock 
++{
++    int ol;
++    int nl;
++    int rename_user;
++    char *olduser, *newuser;
++    char *acl_olduser, *acl_newuser;
++    char *newmailboxname;
++    char *partition;
++};
++
++/* Callback for use by cmd_rename */
++static int renmbox(char *name,
++		   int matchlen __attribute__((unused)),
++		   int maycreate __attribute__((unused)),
++		   void *rock)
++{
++    char oldextname[MAX_MAILBOX_NAME+1];
++    char newextname[MAX_MAILBOX_NAME+1];
++    struct renrock *text = (struct renrock *)rock;
++    int r;
++
++    if((text->nl + strlen(name + text->ol)) > MAX_MAILBOX_NAME)
++	return 0;
++
++    strcpy(text->newmailboxname + text->nl, name + text->ol);
++
++    r = mboxlist_renamemailbox(name, text->newmailboxname,
++			       text->partition,
++			       1, imapd_userid, imapd_authstate);
++    
++    (*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++					   name,
++					   imapd_userid, oldextname);
++    (*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++					   text->newmailboxname,
++					   imapd_userid, newextname);
++
++    if(r) {
++	prot_printf(imapd_out, "* NO rename %s %s: %s\r\n",
++		    oldextname, newextname, error_message(r));
++	if (RENAME_STOP_ON_ERROR) return r;
++    } else {
++	/* If we're renaming a user, change quotaroot and ACL */
++	if (text->rename_user) {
++	    user_copyquotaroot(name, text->newmailboxname);
++	    user_renameacl(text->newmailboxname,
++			   text->acl_olduser, text->acl_newuser);
++	}
++
++	/* Rename mailbox annotations */
++	annotatemore_rename(name, text->newmailboxname,
++			    text->rename_user ? text->olduser : NULL,
++			    text->newuser);
++	
++	prot_printf(imapd_out, "* OK rename %s %s\r\n",
++		    oldextname, newextname);
++    }
++
++    prot_flush(imapd_out);
++
++    return 0;
++}
++
++/*
++ * Perform a RENAME command
++ */
++void cmd_rename(const char *tag, 
++		char *oldname, char *newname, char *partition)
++{
++    int r = 0;
++    char oldmailboxname[MAX_MAILBOX_NAME+3];
++    char newmailboxname[MAX_MAILBOX_NAME+2];
++    char oldextname[MAX_MAILBOX_NAME+1];
++    char newextname[MAX_MAILBOX_NAME+1];
++    int omlen, nmlen;
++    char *p;
++    int recursive_rename = 1;
++    int rename_user = 0;
++    char olduser[128], newuser[128];
++    char acl_olduser[128], acl_newuser[128];
++
++    /* canonicalize names */
++    if (partition && !imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (!r)
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, oldname,
++						   imapd_userid, oldmailboxname);
++    if (!r)
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, newname,
++						   imapd_userid, newmailboxname);
++
++    /* if this is my inbox, don't do recursive renames */
++    if (!strcasecmp(oldname, "inbox")) {
++	recursive_rename = 0;
++    }
++    /* check if we're an admin renaming a user */
++    else if (config_getswitch(IMAPOPT_ALLOWUSERMOVES) &&
++	     mboxname_isusermailbox(oldmailboxname, 1) &&
++	     mboxname_isusermailbox(newmailboxname, 1) &&
++	     strcmp(oldmailboxname, newmailboxname) && /* different user */
++	     imapd_userisadmin) {
++	rename_user = 1;
++    }
++
++    /* if we're renaming something inside of something else, 
++       don't recursively rename stuff */
++    omlen = strlen(oldmailboxname);
++    nmlen = strlen(newmailboxname);
++    if (omlen < nmlen) {
++	if (!strncmp(oldmailboxname, newmailboxname, omlen) &&
++	    newmailboxname[omlen] == '.') {
++	    recursive_rename = 0;
++	}
++    } else {
++	if (!strncmp(oldmailboxname, newmailboxname, nmlen) &&
++	    oldmailboxname[nmlen] == '.') {
++	    recursive_rename = 0;
++	}
++    }
++
++    /* verify that the mailbox doesn't have a wildcard in it */
++    for (p = oldmailboxname; !r && *p; p++) {
++	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
++    }
++
++    /* attempt to rename the base mailbox */
++    if (!r) {
++	r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
++				   imapd_userisadmin, 
++				   imapd_userid, imapd_authstate);
++    }
++
++    /* If we're renaming a user, take care of changing quotaroot, ACL,
++       seen state, subscriptions and sieve scripts */
++    if (!r && rename_user) {
++	char *domain;
++
++	/* create canonified userids */
++
++	domain = strchr(oldmailboxname, '!');
++	strcpy(olduser, domain ? domain+6 : oldmailboxname+5);
++	if (domain)
++	    sprintf(olduser+strlen(olduser), "@%.*s",
++		    domain - oldmailboxname, oldmailboxname);
++	strcpy(acl_olduser, olduser);
++
++	/* Translate any separators in source old userid (for ACLs) */
++	mboxname_hiersep_toexternal(&imapd_namespace, acl_olduser,
++				    config_virtdomains ?
++				    strcspn(acl_olduser, "@") : 0);
++
++	domain = strchr(newmailboxname, '!');
++	strcpy(newuser, domain ? domain+6 : newmailboxname+5);
++	if (domain)
++	    sprintf(newuser+strlen(newuser), "@%.*s",
++		    domain - newmailboxname, newmailboxname);
++	strcpy(acl_newuser, newuser);
++
++	/* Translate any separators in destination new userid (for ACLs) */
++	mboxname_hiersep_toexternal(&imapd_namespace, acl_newuser,
++				    config_virtdomains ?
++				    strcspn(acl_newuser, "@") : 0);
++
++	user_copyquotaroot(oldmailboxname, newmailboxname);
++	user_renameacl(newmailboxname, acl_olduser, acl_newuser);
++	user_renamedata(olduser, newuser, imapd_userid, imapd_authstate);
++
++	/* XXX report status/progress of meta-data */
++    }
++
++    if (!r) {
++	/* Rename mailbox annotations */
++	annotatemore_rename(oldmailboxname, newmailboxname,
++			    rename_user ? olduser : NULL,
++			    newuser);
++    }
++
++    /* rename all mailboxes matching this */
++    if (!r && recursive_rename) {
++	struct renrock rock;
++	int ol = omlen + 1;
++	int nl = nmlen + 1;
++
++	(*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++					       oldmailboxname,
++					       imapd_userid, oldextname);
++	(*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++					       newmailboxname,
++					       imapd_userid, newextname);
++
++	prot_printf(imapd_out, "* OK rename %s %s\r\n",
++		    oldextname, newextname);
++	prot_flush(imapd_out);
++
++	strcat(oldmailboxname, ".*");
++	strcat(newmailboxname, ".");
++
++	/* setup the rock */
++	rock.newmailboxname = newmailboxname;
++	rock.ol = ol;
++	rock.nl = nl;
++	rock.olduser = olduser;
++	rock.newuser = newuser;
++	rock.acl_olduser = acl_olduser;
++	rock.acl_newuser = acl_newuser;
++	rock.partition = partition;
++	rock.rename_user = rename_user;
++	
++	/* add submailboxes; we pretend we're an admin since we successfully
++	   renamed the parent - we're using internal names here */
++	r = mboxlist_findall(NULL, oldmailboxname, 1, imapd_userid,
++			     imapd_authstate, renmbox, &rock);
++    }
++
++    /* take care of deleting old ACLs, subscriptions, seen state and quotas */
++    if (!r && rename_user)
++	user_deletedata(olduser, imapd_userid, imapd_authstate, 1);
++
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 0);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}	
++
++/*
++ * Perform a RECONSTRUCT command
++ */
++void
++cmd_reconstruct(const char *tag, const char *name, int recursive)
++{
++    int r = 0;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char quotaroot[MAX_MAILBOX_NAME+1];
++    struct mailbox mailbox;
++
++    /* administrators only please */
++    if (!imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++    
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, NULL, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	int pid;
++	    
++	/* Reconstruct it */
++
++	pid = fork();
++	if(pid == -1) {
++	    r = IMAP_SYS_ERROR;
++	} else if(pid == 0) {
++	    char buf[4096];
++	    int ret;
++	    
++	    /* Child - exec reconstruct*/	    
++	    syslog(LOG_NOTICE, "Reconstructing '%s' (%s) for user '%s'",
++		   mailboxname, recursive ? "recursive" : "not recursive",
++		   imapd_userid);
++
++	    fclose(stdin);
++	    fclose(stdout);
++	    fclose(stderr);
++
++	    ret = snprintf(buf, sizeof(buf), "%s/reconstruct", SERVICE_PATH);
++	    if(ret < 0 || ret >= sizeof(buf)) {
++		/* in child, so fatailing won't disconnect our user */ 
++	        fatal("reconstruct buffer not sufficiently big", EC_CONFIG);
++	    }
++
++	    if(recursive) {
++		execl(buf, buf, "-C", config_filename, "-r", "-f",
++		      mailboxname, NULL);
++	    } else {
++		execl(buf, buf, "-C", config_filename, mailboxname, NULL);
++	    }
++	    
++	    /* if we are here, we have a problem */
++	    exit(-1);
++	} else {
++	    int status;
++
++	    /* Parent, wait on child */
++	    if(waitpid(pid, &status, 0) < 0) r = IMAP_SYS_ERROR;
++
++	    /* Did we fail? */
++	    if(WEXITSTATUS(status) != 0) r = IMAP_SYS_ERROR;
++	}
++    }
++
++    /* Still in parent, need to re-quota the mailbox*/
++
++    /* Find its quota root */
++    if (!r) {
++	r = mailbox_open_header(mailboxname, imapd_authstate, &mailbox);
++    }
++
++    if(!r) {
++	if(mailbox.quota.root) {
++	    strcpy(quotaroot, mailbox.quota.root);
++	} else {
++	    strcpy(quotaroot, mailboxname);
++	}
++	mailbox_close(&mailbox);
++    }
++    
++    /* Run quota -f */
++    if (!r) {
++	int pid;
++
++	pid = fork();
++	if(pid == -1) {
++	    r = IMAP_SYS_ERROR;
++	} else if(pid == 0) {
++	    char buf[4096];
++	    int ret;
++	    
++	    /* Child - exec reconstruct*/	    
++	    syslog(LOG_NOTICE,
++		   "Regenerating quota roots starting with '%s' for user '%s'",
++		   mailboxname, imapd_userid);
++
++	    fclose(stdin);
++	    fclose(stdout);
++	    fclose(stderr);
++
++	    ret = snprintf(buf, sizeof(buf), "%s/quota", SERVICE_PATH);
++	    if(ret < 0 || ret >= sizeof(buf)) {
++		/* in child, so fatailing won't disconnect our user */ 
++	        fatal("quota buffer not sufficiently big", EC_CONFIG);
++	    }
++
++	    execl(buf, buf, "-C", config_filename, "-f", quotaroot, NULL);
++	    
++	    /* if we are here, we have a problem */
++	    exit(-1);
++	} else {
++	    int status;
++
++	    /* Parent, wait on child */
++	    if(waitpid(pid, &status, 0) < 0) r = IMAP_SYS_ERROR;
++
++	    /* Did we fail? */
++	    if(WEXITSTATUS(status) != 0) r = IMAP_SYS_ERROR;
++	}
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}	
++
++/*
++ * Perform a FIND command
++ */
++void
++cmd_find(tag, namespace, pattern)
++char *tag;
++char *namespace;
++char *pattern;
++{
++    char *p;
++    lcase(namespace);
++
++    for (p = pattern; *p; p++) {
++	if (*p == '%') *p = '?';
++    }
++
++    /* Translate any separators in pattern */
++    mboxname_hiersep_tointernal(&imapd_namespace, pattern,
++				config_virtdomains ?
++				strcspn(pattern, "@") : 0);
++
++    if (!strcasecmp(namespace, "mailboxes")) {
++	int force = config_getswitch(IMAPOPT_ALLOWALLSUBSCRIBE);
++
++	(*imapd_namespace.mboxlist_findsub)(&imapd_namespace, pattern,
++					    imapd_userisadmin, imapd_userid,
++					    imapd_authstate, mailboxdata,
++					    NULL, force);
++    }
++    else if (!strcasecmp(namespace, "all.mailboxes")) {
++	(*imapd_namespace.mboxlist_findall)(&imapd_namespace, pattern,
++					    imapd_userisadmin, imapd_userid,
++					    imapd_authstate, mailboxdata, NULL);
++    }
++    else if (!strcasecmp(namespace, "bboards")
++	     || !strcasecmp(namespace, "all.bboards")) {
++	;
++    }
++    else {
++	prot_printf(imapd_out, "%s BAD Invalid FIND subcommand\r\n", tag);
++	return;
++    }
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++static int mstringdatacalls;
++
++/*
++ * Perform a LIST or LSUB command
++ */
++void cmd_list(char *tag, int listopts, char *reference, char *pattern)
++{
++    char *buf = NULL;
++    int patlen = 0;
++    int reflen = 0;
++    static int ignorereference = 0;
++    clock_t start = clock();
++    char mytime[100];
++    int (*findall)(struct namespace *namespace,
++		   const char *pattern, int isadmin, char *userid, 
++		   struct auth_state *auth_state, int (*proc)(),
++		   void *rock);
++    int (*findsub)(struct namespace *namespace,
++		   const char *pattern, int isadmin, char *userid, 
++		   struct auth_state *auth_state, int (*proc)(),
++		   void *rock, int force);
++
++    /* Ignore the reference argument?
++       (the behavior in 1.5.10 & older) */
++    if (ignorereference == 0) {
++	ignorereference = config_getswitch(IMAPOPT_IGNOREREFERENCE);
++    }
++
++    /* Reset state in mstringdata */
++    mstringdata(NULL, NULL, 0, 0, 0);
++
++    if (!pattern[0] && !(listopts & LIST_LSUB)) {
++	/* Special case: query top-level hierarchy separator */
++	prot_printf(imapd_out, "* LIST (\\Noselect) \"%c\" \"\"\r\n",
++		    imapd_namespace.hier_sep);
++    } else {
++	/* Do we need to concatenate fields? */
++	if (!ignorereference || pattern[0] == imapd_namespace.hier_sep) {
++	    /* Either
++	     * - name begins with dot
++	     * - we're configured to honor the reference argument */
++
++	    /* Allocate a buffer, figure out how to stick the arguments
++	       together, do it, then do that instead of using pattern. */
++	    patlen = strlen(pattern);
++	    reflen = strlen(reference);
++	    
++	    buf = xmalloc(patlen + reflen + 1);
++	    buf[0] = '\0';
++
++	    if (*reference) {
++		/* check for LIST A. .B, change to LIST "" A.B */
++		if (reference[reflen-1] == imapd_namespace.hier_sep &&
++		    pattern[0] == imapd_namespace.hier_sep) {
++		    reference[--reflen] = '\0';
++		}
++		strcpy(buf, reference);
++	    }
++	    strcat(buf, pattern);
++	    pattern = buf;
++	}
++
++	/* Translate any separators in pattern */
++	mboxname_hiersep_tointernal(&imapd_namespace, pattern,
++				    config_virtdomains ?
++				    strcspn(pattern, "@") : 0);
++
++	/* Check to see if we should only list the personal namespace */
++	if (!strcmp(pattern, "*")
++	    && config_getswitch(IMAPOPT_FOOLSTUPIDCLIENTS)) {
++	    if (buf) free(buf);
++	    buf = xstrdup("INBOX*");
++	    pattern = buf;
++	    findsub = mboxlist_findsub;
++	    findall = mboxlist_findall;
++	}
++	else {
++	    findsub = imapd_namespace.mboxlist_findsub;
++	    findall = imapd_namespace.mboxlist_findall;
++	}
++
++	if (listopts & (LIST_LSUB | LIST_SUBSCRIBED)) {
++	    int force = config_getswitch(IMAPOPT_ALLOWALLSUBSCRIBE);
++
++	    (*findsub)(&imapd_namespace, pattern,
++		       imapd_userisadmin, imapd_userid, imapd_authstate,
++		       listdata, &listopts, force);
++	}
++	else {
++	    (*findall)(&imapd_namespace, pattern,
++		       imapd_userisadmin, imapd_userid, imapd_authstate,
++		       listdata, &listopts);
++	}
++
++	listdata((char *)0, 0, 0, &listopts);
++
++	if (buf) free(buf);
++    }
++    snprintf(mytime, sizeof(mytime), "%2.3f",
++	     (clock() - start) / (double) CLOCKS_PER_SEC);
++    prot_printf(imapd_out, "%s OK %s (%s secs %d calls)\r\n", tag,
++		error_message(IMAP_OK_COMPLETED), mytime, mstringdatacalls);
++}
++  
++/*
++ * Perform a SUBSCRIBE (add is nonzero) or
++ * UNSUBSCRIBE (add is zero) command
++ */
++void cmd_changesub(char *tag, char *namespace, 
++		   char *name, int add)
++{
++    int r;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int force = config_getswitch(IMAPOPT_ALLOWALLSUBSCRIBE);
++
++    if (namespace) lcase(namespace);
++    if (!namespace || !strcmp(namespace, "mailbox")) {
++	int len = strlen(name);
++	if (force && imapd_namespace.isalt &&
++	    (((len == strlen(imapd_namespace.prefix[NAMESPACE_USER]) - 1) &&
++	      !strncmp(name, imapd_namespace.prefix[NAMESPACE_USER], len)) ||
++	     ((len == strlen(imapd_namespace.prefix[NAMESPACE_SHARED]) - 1) &&
++	      !strncmp(name, imapd_namespace.prefix[NAMESPACE_SHARED], len)))) {
++	    r = 0;
++	}
++	else {
++	    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						       imapd_userid, mailboxname);
++	    if (!r) {
++		r = mboxlist_changesub(mailboxname, imapd_userid, 
++				       imapd_authstate, add, force);
++	    }
++	}
++    }
++    else if (!strcmp(namespace, "bboard")) {
++	r = add ? IMAP_MAILBOX_NONEXISTENT : 0;
++    }
++    else {
++	prot_printf(imapd_out, "%s BAD Invalid %s subcommand\r\n", tag,
++	       add ? "Subscribe" : "Unsubscribe");
++	return;
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s: %s\r\n", tag,
++	       add ? "Subscribe" : "Unsubscribe", error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}
++
++/*
++ * Perform a GETACL command
++ */
++void cmd_getacl(const char *tag, const char *name)
++{
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int r, access;
++    char *acl;
++    char *rights, *nextid;
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	access = cyrus_acl_myrights(imapd_authstate, acl);
++
++	if (!(access & (ACL_READ|ACL_ADMIN)) &&
++	    !imapd_userisadmin &&
++	    !mboxname_userownsmailbox(imapd_userid, mailboxname)) {
++	    r = (access&ACL_LOOKUP) ?
++	      IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++	}
++    }
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "* ACL ");
++    printastring(name);
++    
++    while (acl) {
++	rights = strchr(acl, '\t');
++	if (!rights) break;
++	*rights++ = '\0';
++	
++	nextid = strchr(rights, '\t');
++	if (!nextid) break;
++	*nextid++ = '\0';
++	
++	prot_printf(imapd_out, " ");
++	printastring(acl);
++	prot_printf(imapd_out, " ");
++	printastring(rights);
++	acl = nextid;
++    }
++    prot_printf(imapd_out, "\r\n");
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Perform a LISTRIGHTS command
++ */
++void
++cmd_listrights(tag, name, identifier)
++char *tag;
++char *name;
++char *identifier;
++{
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int r, rights;
++    char *acl;
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	rights = cyrus_acl_myrights(imapd_authstate, acl);
++
++	if (!rights && !imapd_userisadmin &&
++	    !mboxname_userownsmailbox(imapd_userid, mailboxname)) {
++	    r = IMAP_MAILBOX_NONEXISTENT;
++	}
++    }
++
++    if (!r) {
++	struct auth_state *authstate = auth_newstate(identifier);
++	char *canon_identifier;
++	int canonidlen = 0;
++	int implicit;
++	char rightsdesc[100], optional[33];
++
++	if (global_authisa(authstate, IMAPOPT_ADMINS))
++	    canon_identifier = identifier; /* don't canonify global admins */
++	else
++	    canon_identifier = canonify_userid(identifier, imapd_userid, NULL);
++	auth_freestate(authstate);
++
++	if (canon_identifier) canonidlen = strlen(canon_identifier);
++
++	if (!canon_identifier) {
++	    implicit = 0;
++	}
++	else if (mboxname_userownsmailbox(canon_identifier, mailboxname)) {
++	    /* identifier's personal mailbox */
++	    implicit = config_implicitrights;
++	}
++	else if (mboxname_isusermailbox(mailboxname, 1)) {
++	    /* anyone can post to an INBOX */
++	    implicit = ACL_POST;
++	}
++	else {
++	    implicit = 0;
++	}
++
++	/* calculate optional rights */
++	cyrus_acl_masktostr(implicit ^ (canon_identifier ? ACL_FULL : 0),
++			    optional);
++
++	/* build the rights string */
++	if (implicit) {
++	    cyrus_acl_masktostr(implicit, rightsdesc);
++	}
++	else {
++	    strcpy(rightsdesc, "\"\"");
++	}
++
++	if (*optional) {
++	    int i, n = strlen(optional);
++	    char *p = rightsdesc + strlen(rightsdesc);
++
++	    for (i = 0; i < n; i++) {
++		*p++ = ' ';
++		*p++ = optional[i];
++	    }
++	    *p = '\0';
++	}
++
++	prot_printf(imapd_out, "* LISTRIGHTS ");
++	printastring(name);
++	prot_putc(' ', imapd_out);
++	printastring(identifier);
++	prot_printf(imapd_out, " %s", rightsdesc);
++
++	prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++	return;
++    }
++
++    prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++}
++
++/*
++ * Perform a MYRIGHTS command
++ */
++void cmd_myrights(const char *tag, const char *name)
++{
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int r, rights = 0;
++    char *acl;
++    char str[ACL_MAXSTR];
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	rights = cyrus_acl_myrights(imapd_authstate, acl);
++
++	/* Add in implicit rights */
++	if (imapd_userisadmin) {
++	    rights |= ACL_LOOKUP|ACL_ADMIN;
++	}
++	else if (mboxname_userownsmailbox(imapd_userid, mailboxname)) {
++	    rights |= config_implicitrights;
++	}
++
++	if (!rights) {
++	    r = IMAP_MAILBOX_NONEXISTENT;
++	}
++    }
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "* MYRIGHTS ");
++    printastring(name);
++    prot_printf(imapd_out, " ");
++    printastring(cyrus_acl_masktostr(rights, str));
++    prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Perform a SETACL command
++ */
++void cmd_setacl(const char *tag, const char *name,
++		const char *identifier, const char *rights)
++{
++    int r;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    /* is it remote? */
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, NULL, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++    
++    if (!r) {
++	r = mboxlist_setacl(mailboxname, identifier, rights,
++			    imapd_userisadmin, imapd_userid, imapd_authstate);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Perform a GETQUOTA command
++ */
++void
++cmd_getquota(const char *tag, const char *name)
++{
++    int r;
++    struct quota quota;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++
++    if (!imapd_userisadmin) r = IMAP_PERMISSION_DENIED;
++    else {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++	if (!r) {
++	    quota.root = mailboxname;
++	    r = quota_read(&quota, NULL, 0);
++	}
++    }
++    
++    if (!r) {
++	prot_printf(imapd_out, "* QUOTA ");
++	printastring(name);
++	prot_printf(imapd_out, " (");
++	if (quota.limit >= 0) {
++	    prot_printf(imapd_out, "STORAGE %lu %d",
++			quota.used/QUOTA_UNITS, quota.limit);
++	}
++	prot_printf(imapd_out, ")\r\n");
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++
++/*
++ * Perform a GETQUOTAROOT command
++ */
++void
++cmd_getquotaroot(const char *tag, const char *name)
++{
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    struct mailbox mailbox;
++    int r;
++    int doclose = 0;
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, NULL, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	r = mailbox_open_header(mailboxname, imapd_authstate, &mailbox);
++    }
++
++    if (!r) {
++	doclose = 1;
++	if (!imapd_userisadmin && !(mailbox.myrights & ACL_READ)) {
++	    r = (mailbox.myrights & ACL_LOOKUP) ?
++	      IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++	}
++    }
++
++    if (!r) {
++	prot_printf(imapd_out, "* QUOTAROOT ");
++	printastring(name);
++	if (mailbox.quota.root) {
++	    (*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++						   mailbox.quota.root,
++						   imapd_userid, mailboxname);
++	    prot_printf(imapd_out, " ");
++	    printastring(mailboxname);
++	    r = quota_read(&mailbox.quota, NULL, 0);
++	    if (!r) {
++		prot_printf(imapd_out, "\r\n* QUOTA ");
++		printastring(mailboxname);
++		prot_printf(imapd_out, " (");
++		if (mailbox.quota.limit >= 0) {
++		    prot_printf(imapd_out, "STORAGE %lu %d",
++				mailbox.quota.used/QUOTA_UNITS,
++				mailbox.quota.limit);
++		}
++		prot_putc(')', imapd_out);
++	    }
++	}
++	prot_printf(imapd_out, "\r\n");
++    }
++
++    if (doclose) mailbox_close(&mailbox);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Parse and perform a SETQUOTA command
++ * The command has been parsed up to the resource list
++ */
++void
++cmd_setquota(const char *tag, const char *quotaroot)
++{
++    int newquota = -1;
++    int badresource = 0;
++    int c;
++    int force = 0;
++    static struct buf arg;
++    char *p;
++    int r;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++
++    c = prot_getc(imapd_in);
++    if (c != '(') goto badlist;
++
++    c = getword(imapd_in, &arg);
++    if (c != ')' || arg.s[0] != '\0') {
++	for (;;) {
++	    if (c != ' ') goto badlist;
++	    if (strcasecmp(arg.s, "storage") != 0) badresource = 1;
++	    c = getword(imapd_in, &arg);
++	    if (c != ' ' && c != ')') goto badlist;
++	    if (arg.s[0] == '\0') goto badlist;
++	    newquota = 0;
++	    for (p = arg.s; *p; p++) {
++		if (!isdigit((int) *p)) goto badlist;
++		newquota = newquota * 10 + *p - '0';
++                if (newquota < 0) goto badlist; /* overflow */
++	    }
++	    if (c == ')') break;
++	}
++    }
++    c = prot_getc(imapd_in);
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to SETQUOTA\r\n", tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    if (badresource) r = IMAP_UNSUPPORTED_QUOTA;
++    else if (!imapd_userisadmin && !imapd_userisproxyadmin) {
++	/* need to allow proxies so that mailbox moves can set initial quota
++	 * roots */
++	r = IMAP_PERMISSION_DENIED;
++    } else {
++	/* are we forcing the creation of a quotaroot by having a leading +? */
++	if(quotaroot[0] == '+') {
++	    force = 1;
++	    quotaroot++;
++	}
++	
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, quotaroot,
++						   imapd_userid, mailboxname);
++
++	if (!r) {
++	    r = mboxlist_setquota(mailboxname, newquota, force);
++	}
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++    return;
++
++ badlist:
++    prot_printf(imapd_out, "%s BAD Invalid quota list in Setquota\r\n", tag);
++    eatline(imapd_in, c);
++}
++
++#ifdef HAVE_SSL
++/*
++ * this implements the STARTTLS command, as described in RFC 2595.
++ * one caveat: it assumes that no external layer is currently present.
++ * if a client executes this command, information about the external
++ * layer that was passed on the command line is disgarded. this should
++ * be fixed.
++ */
++/* imaps - whether this is an imaps transaction or not */
++void cmd_starttls(char *tag, int imaps)
++{
++    int result;
++    int *layerp;
++
++    char *auth_id;
++    sasl_ssf_t ssf;
++
++    /* SASL and openssl have different ideas about whether ssf is signed */
++    layerp = (int *) &ssf;
++
++    if (imapd_starttls_done == 1)
++    {
++	prot_printf(imapd_out, "%s NO TLS already active\r\n", tag);
++	return;
++    }
++
++    result=tls_init_serverengine("imap",
++				 5,        /* depth to verify */
++				 !imaps,   /* can client auth? */
++				 !imaps);  /* TLS only? */
++
++    if (result == -1) {
++
++	syslog(LOG_ERR, "error initializing TLS");
++
++	if (imaps == 0) {
++	    prot_printf(imapd_out, "%s NO Error initializing TLS\r\n", tag);
++ 	} else {
++	    fatal("tls_init() failed", EC_CONFIG);
++	}
++
++	return;
++    }
++
++    if (imaps == 0)
++    {
++	prot_printf(imapd_out, "%s OK Begin TLS negotiation now\r\n", tag);
++	/* must flush our buffers before starting tls */
++	prot_flush(imapd_out);
++    }
++  
++    result=tls_start_servertls(0, /* read */
++			       1, /* write */
++			       layerp,
++			       &auth_id,
++			       &tls_conn);
++
++    /* if error */
++    if (result==-1) {
++	if (imaps == 0)	{
++	    prot_printf(imapd_out, "%s NO Starttls negotiation failed\r\n", 
++			tag);
++	    syslog(LOG_NOTICE, "STARTTLS negotiation failed: %s", 
++		   imapd_clienthost);
++	    return;
++	} else {
++	    syslog(LOG_NOTICE, "imaps TLS negotiation failed: %s", 
++		   imapd_clienthost);
++	    fatal("tls_start_servertls() failed", EC_TEMPFAIL);
++	    return;
++	}
++    }
++
++    /* tell SASL about the negotiated layer */
++    result = sasl_setprop(imapd_saslconn, SASL_SSF_EXTERNAL, &ssf);
++    if (result != SASL_OK) {
++	fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
++    }
++    saslprops.ssf = ssf;
++
++    result = sasl_setprop(imapd_saslconn, SASL_AUTH_EXTERNAL, auth_id);
++    if (result != SASL_OK) {
++	fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
++    }
++    if(saslprops.authid) {
++	free(saslprops.authid);
++	saslprops.authid = NULL;
++    }
++    if(auth_id)
++        saslprops.authid = xstrdup(auth_id);
++
++    /* tell the prot layer about our new layers */
++    prot_settls(imapd_in, tls_conn);
++    prot_settls(imapd_out, tls_conn);
++
++    imapd_starttls_done = 1;
++}
++#else
++void cmd_starttls(char *tag, int imaps)
++{
++    fatal("cmd_starttls() executed, but starttls isn't implemented!",
++	  EC_SOFTWARE);
++}
++#endif /* HAVE_SSL */
++
++/*
++ * Parse and perform a STATUS command
++ * The command has been parsed up to the attribute list
++ */
++void
++cmd_status(tag, name)
++char *tag;
++char *name;
++{
++    int c;
++    int statusitems = 0;
++    static struct buf arg;
++    struct mailbox mailbox;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int r = 0;
++    int doclose = 0;
++
++    c = prot_getc(imapd_in);
++    if (c != '(') goto badlist;
++
++    c = getword(imapd_in, &arg);
++    if (arg.s[0] == '\0') goto badlist;
++    for (;;) {
++	lcase(arg.s);
++	if (!strcmp(arg.s, "messages")) {
++	    statusitems |= STATUS_MESSAGES;
++	}
++	else if (!strcmp(arg.s, "recent")) {
++	    statusitems |= STATUS_RECENT;
++	}
++	else if (!strcmp(arg.s, "uidnext")) {
++	    statusitems |= STATUS_UIDNEXT;
++	}
++	else if (!strcmp(arg.s, "uidvalidity")) {
++	    statusitems |= STATUS_UIDVALIDITY;
++	}
++	else if (!strcmp(arg.s, "unseen")) {
++	    statusitems |= STATUS_UNSEEN;
++	}
++	else {
++	    prot_printf(imapd_out, "%s BAD Invalid Status attribute %s\r\n",
++			tag, arg.s);
++	    eatline(imapd_in, c);
++	    return;
++	}
++	    
++	if (c == ' ') c = getword(imapd_in, &arg);
++	else break;
++    }
++
++    if (c != ')') {
++	prot_printf(imapd_out,
++		    "%s BAD Missing close parenthesis in Status\r\n", tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    c = prot_getc(imapd_in);
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out,
++		    "%s BAD Unexpected extra arguments to Status\r\n", tag);
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /*
++     * Perform a full checkpoint of any open mailbox, in case we're
++     * doing a STATUS check of the current mailbox.
++     */
++    if (imapd_mailbox) {
++	index_check(imapd_mailbox, 0, 1);
++    }
++
++    r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++					       imapd_userid, mailboxname);
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, NULL, NULL, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if (!r) {
++	r = mailbox_open_header(mailboxname, imapd_authstate, &mailbox);
++    }
++
++    if (!r) {
++	doclose = 1;
++	r = mailbox_open_index(&mailbox);
++    }
++    if (!r && !(mailbox.myrights & ACL_READ)) {
++	r = (imapd_userisadmin || (mailbox.myrights & ACL_LOOKUP)) ?
++	  IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++    }
++
++    if (!r) {
++	r = index_status(&mailbox, name, statusitems);
++    }
++
++    if (doclose) mailbox_close(&mailbox);
++    
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++	return;
++    }
++    
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++    return;
++
++ badlist:
++    prot_printf(imapd_out, "%s BAD Invalid status list in Status\r\n", tag);
++    eatline(imapd_in, c);
++}
++
++#ifdef ENABLE_X_NETSCAPE_HACK
++/*
++ * Reply to Netscape's crock with a crock of my own
++ */
++void cmd_netscrape(char *tag)
++{
++    const char *url;
++
++    url = config_getstring(IMAPOPT_NETSCAPEURL);
++
++    /* I only know of three things to reply with: */
++    prot_printf(imapd_out,
++		"* OK [NETSCAPE] Carnegie Mellon Cyrus IMAP\r\n"
++		"* VERSION %s\r\n",
++		CYRUS_VERSION);
++    if (url) prot_printf(imapd_out, "* ACCOUNT-URL %s\r\n", url);
++    prot_printf(imapd_out, "%s OK %s\r\n",
++		tag, error_message(IMAP_OK_COMPLETED));
++}
++#endif /* ENABLE_X_NETSCAPE_HACK */
++
++/* Callback for cmd_namespace to be passed to mboxlist_findall.
++ * For each top-level mailbox found, print a bit of the response
++ * if it is a shared namespace.  The rock is used as an integer in
++ * order to ensure the namespace response is correct on a server with
++ * no shared namespace.
++ */
++static int namespacedata(char *name,
++			 int matchlen __attribute__((unused)),
++			 int maycreate __attribute__((unused)),
++			 void *rock)
++{
++    int* sawone = (int*) rock;
++
++    if (!name) {
++	return 0;
++    }
++    
++    if (!(strncmp(name, "INBOX.", 6))) {
++	/* The user has a "personal" namespace. */
++	sawone[NAMESPACE_INBOX] = 1;
++    } else if (mboxname_isusermailbox(name, 0)) {
++	/* The user can see the "other users" namespace. */
++	sawone[NAMESPACE_USER] = 1;
++    } else {
++	/* The user can see the "shared" namespace. */
++	sawone[NAMESPACE_SHARED] = 1;
++    }
++
++    return 0;
++}
++
++/*
++ * Print out a response to the NAMESPACE command defined by
++ * RFC 2342.
++ */
++void cmd_namespace(tag)
++    char* tag;
++{
++    int sawone[3] = {0, 0, 0};
++    char* pattern;
++
++    if (SLEEZY_NAMESPACE) {
++	char inboxname[MAX_MAILBOX_NAME+1];
++
++	if (strlen(imapd_userid) + 5 > MAX_MAILBOX_NAME)
++	    sawone[NAMESPACE_INBOX] = 0;
++	else {
++	    (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, "INBOX",
++						   imapd_userid, inboxname);
++	    sawone[NAMESPACE_INBOX] = 
++		!mboxlist_lookup(inboxname, NULL, NULL, NULL);
++	}
++	sawone[NAMESPACE_USER] = 1;
++	sawone[NAMESPACE_SHARED] = 1;
++    } else {
++	pattern = xstrdup("%");
++	/* now find all the exciting toplevel namespaces -
++	 * we're using internal names here
++	 */
++	mboxlist_findall(NULL, pattern, imapd_userisadmin, imapd_userid,
++			 imapd_authstate, namespacedata, (void*) sawone);
++	free(pattern);
++    }
++
++    prot_printf(imapd_out, "* NAMESPACE");
++    if (sawone[NAMESPACE_INBOX]) {
++	prot_printf(imapd_out, " ((\"%s\" \"%c\"))",
++		    imapd_namespace.prefix[NAMESPACE_INBOX],
++		    imapd_namespace.hier_sep);
++    } else {
++	prot_printf(imapd_out, " NIL");
++    }
++    if (sawone[NAMESPACE_USER]) {
++	prot_printf(imapd_out, " ((\"%s\" \"%c\"))",
++		    imapd_namespace.prefix[NAMESPACE_USER],
++		    imapd_namespace.hier_sep);
++    } else {
++	prot_printf(imapd_out, " NIL");
++    }
++    if (sawone[NAMESPACE_SHARED]) {
++	prot_printf(imapd_out, " ((\"%s\" \"%c\"))",
++		    imapd_namespace.prefix[NAMESPACE_SHARED],
++		    imapd_namespace.hier_sep);
++    } else {
++	prot_printf(imapd_out, " NIL");
++    }
++    prot_printf(imapd_out, "\r\n");
++
++    prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		error_message(IMAP_OK_COMPLETED));
++}
++
++/*
++ * Parse annotate fetch data.
++ *
++ * This is a generic routine which parses just the annotation data.
++ * Any surrounding command text must be parsed elsewhere, ie,
++ * GETANNOTATION, FETCH.
++ */
++
++int getannotatefetchdata(char *tag,
++			 struct strlist **entries, struct strlist **attribs)
++{
++    int c;
++    static struct buf arg;
++
++    *entries = *attribs = NULL;
++
++    c = prot_getc(imapd_in);
++    if (c == EOF) {
++	prot_printf(imapd_out,
++		    "%s BAD Missing annotation entry\r\n", tag);
++	goto baddata;
++    }
++    else if (c == '(') {
++	/* entry list */
++	do {
++	    c = getqstring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) {
++		prot_printf(imapd_out,
++			    "%s BAD Missing annotation entry\r\n", tag);
++		goto baddata;
++	    }
++
++	    /* add the entry to the list */
++	    appendstrlist(entries, arg.s);
++
++	} while (c == ' ');
++
++	if (c != ')') {
++	    prot_printf(imapd_out,
++			"%s BAD Missing close paren in annotation entry list \r\n",
++			tag);
++	    goto baddata;
++	}
++
++	c = prot_getc(imapd_in);
++    }
++    else {
++	/* single entry -- add it to the list */
++	prot_ungetc(c, imapd_in);
++	c = getqstring(imapd_in, imapd_out, &arg);
++	if (c == EOF) {
++	    prot_printf(imapd_out,
++			"%s BAD Missing annotation entry\r\n", tag);
++	    goto baddata;
++	}
++
++	appendstrlist(entries, arg.s);
++    }
++
++    if (c != ' ' || (c = prot_getc(imapd_in)) == EOF) {
++	prot_printf(imapd_out,
++		    "%s BAD Missing annotation attribute(s)\r\n", tag);
++	goto baddata;
++    }
++
++    if (c == '(') {
++	/* attrib list */
++	do {
++	    c = getnstring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) {
++		prot_printf(imapd_out,
++			    "%s BAD Missing annotation attribute(s)\r\n", tag);
++		goto baddata;
++	    }
++
++	    /* add the attrib to the list */
++	    appendstrlist(attribs, arg.s);
++
++	} while (c == ' ');
++
++	if (c != ')') {
++	    prot_printf(imapd_out,
++			"%s BAD Missing close paren in "
++			"annotation attribute list\r\n", tag);
++	    goto baddata;
++	}
++
++	c = prot_getc(imapd_in);
++    }
++    else {
++	/* single attrib */
++	prot_ungetc(c, imapd_in);
++	c = getqstring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) {
++		prot_printf(imapd_out,
++			    "%s BAD Missing annotation attribute\r\n", tag);
++		goto baddata;
++	    }
++
++	appendstrlist(attribs, arg.s);
++   }
++
++    return c;
++
++  baddata:
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++}
++
++/*
++ * Parse annotate store data.
++ *
++ * This is a generic routine which parses just the annotation data.
++ * Any surrounding command text must be parsed elsewhere, ie,
++ * SETANNOTATION, STORE, APPEND.
++ */
++
++int getannotatestoredata(char *tag, struct entryattlist **entryatts)
++{
++    int c, islist = 0;
++    static struct buf entry, attrib, value;
++    struct attvaluelist *attvalues = NULL;
++
++    *entryatts = NULL;
++
++    c = prot_getc(imapd_in);
++    if (c == EOF) {
++	prot_printf(imapd_out,
++		    "%s BAD Missing annotation entry\r\n", tag);
++	goto baddata;
++    }
++    else if (c == '(') {
++	/* entry list */
++	islist = 1;
++    }
++    else {
++	/* single entry -- put the char back */
++	prot_ungetc(c, imapd_in);
++    }
++
++    do {
++	/* get entry */
++	c = getqstring(imapd_in, imapd_out, &entry);
++	if (c == EOF) {
++	    prot_printf(imapd_out,
++			"%s BAD Missing annotation entry\r\n", tag);
++	    goto baddata;
++	}
++
++	/* parse att-value list */
++	if (c != ' ' || (c = prot_getc(imapd_in)) != '(') {
++	    prot_printf(imapd_out,
++			"%s BAD Missing annotation attribute-values list\r\n",
++			tag);
++	    goto baddata;
++	}
++
++	do {
++	    /* get attrib */
++	    c = getqstring(imapd_in, imapd_out, &attrib);
++	    if (c == EOF) {
++		prot_printf(imapd_out,
++			    "%s BAD Missing annotation attribute\r\n", tag);
++		goto baddata;
++	    }
++
++	    /* get value */
++	    if (c != ' ' ||
++		(c = getnstring(imapd_in, imapd_out, &value)) == EOF) {
++		prot_printf(imapd_out,
++			    "%s BAD Missing annotation value\r\n", tag);
++		goto baddata;
++	    }
++
++	    /* add the attrib-value pair to the list */
++	    appendattvalue(&attvalues, attrib.s, value.s);
++
++	} while (c == ' ');
++
++	if (c != ')') {
++	    prot_printf(imapd_out,
++			"%s BAD Missing close paren in annotation "
++			"attribute-values list\r\n", tag);
++	    goto baddata;
++	}
++
++	/* add the entry to the list */
++	appendentryatt(entryatts, entry.s, attvalues);
++	attvalues = NULL;
++
++	c = prot_getc(imapd_in);
++
++    } while (c == ' ');
++
++    if (islist) {
++	if (c != ')') {
++	    prot_printf(imapd_out,
++			"%s BAD Missing close paren in annotation entry list \r\n",
++			tag);
++	    goto baddata;
++	}
++
++	c = prot_getc(imapd_in);
++    }
++
++    return c;
++
++  baddata:
++    if (attvalues) freeattvalues(attvalues);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++}
++
++/*
++ * Output an entry/attribute-value list response.
++ *
++ * This is a generic routine which outputs just the annotation data.
++ * Any surrounding response text must be output elsewhere, ie,
++ * GETANNOTATION, FETCH. 
++ */
++void annotate_response(struct entryattlist *l)
++{
++    int islist; /* do we have more than one entry? */
++
++    if (!l) return;
++
++    islist = (l->next != NULL);
++
++    if (islist) prot_printf(imapd_out, "(");
++
++    while (l) {
++	prot_printf(imapd_out, "\"%s\"", l->entry);
++
++	/* do we have attributes?  solicited vs. unsolicited */
++	if (l->attvalues) {
++	    struct attvaluelist *av = l->attvalues;
++
++	    prot_printf(imapd_out, " (");
++	    while (av) {
++		prot_printf(imapd_out, "\"%s\" ", av->attrib);
++		if (!strcasecmp(av->value, "NIL"))
++		    prot_printf(imapd_out, "NIL");
++		else
++		    prot_printf(imapd_out, "\"%s\"", av->value);
++
++		if ((av = av->next) == NULL)
++		    prot_printf(imapd_out, ")");
++		else
++		    prot_printf(imapd_out, " ");
++	    }
++	}
++
++	if ((l = l->next) != NULL)
++	    prot_printf(imapd_out, " ");
++    }
++
++    if (islist) prot_printf(imapd_out, ")");
++}
++
++/*
++ * Perform a GETANNOTATION command
++ *
++ * The command has been parsed up to the entries
++ */    
++void cmd_getannotation(char *tag, char *mboxpat)
++{
++    int c, r = 0;
++    struct strlist *entries = NULL, *attribs = NULL;
++
++    c = getannotatefetchdata(tag, &entries, &attribs);
++    if (c == EOF) {
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /* check for CRLF */
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out,
++		    "%s BAD Unexpected extra arguments to Getannotation\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	goto freeargs;
++    }
++
++    r = annotatemore_fetch(mboxpat, entries, attribs, &imapd_namespace,
++			   imapd_userisadmin || imapd_userisproxyadmin,
++			   imapd_userid, imapd_authstate, imapd_out);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n",
++		    tag, error_message(IMAP_OK_COMPLETED));
++    }
++
++  freeargs:
++    if (entries) freestrlist(entries);
++    if (attribs) freestrlist(attribs);
++
++    return;
++}
++
++/*
++ * Perform a SETANNOTATION command
++ *
++ * The command has been parsed up to the entry-att list
++ */    
++void cmd_setannotation(char *tag, char *mboxpat)
++{
++    int c, r = 0;
++    struct entryattlist *entryatts = NULL;
++
++    c = getannotatestoredata(tag, &entryatts);
++    if (c == EOF) {
++	eatline(imapd_in, c);
++	return;
++    }
++
++    /* check for CRLF */
++    if (c == '\r') c = prot_getc(imapd_in);
++    if (c != '\n') {
++	prot_printf(imapd_out,
++		    "%s BAD Unexpected extra arguments to Setannotation\r\n",
++		    tag);
++	eatline(imapd_in, c);
++	goto freeargs;
++    }
++
++    r = annotatemore_store(mboxpat,
++			   entryatts, &imapd_namespace, imapd_userisadmin,
++			   imapd_userid, imapd_authstate);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++
++  freeargs:
++    if (entryatts) freeentryatts(entryatts);
++    return;
++}
++
++/*
++ * Parse a search program
++ */
++int getsearchprogram(tag, searchargs, charset, parsecharset)
++char *tag;
++struct searchargs *searchargs;
++int *charset;
++int parsecharset;
++{
++    int c;
++
++    do {
++	c = getsearchcriteria(tag, searchargs, charset, parsecharset);
++	parsecharset = 0;
++    } while (c == ' ');
++    return c;
++}
++
++/*
++ * Parse a search criteria
++ */
++int getsearchcriteria(tag, searchargs, charset, parsecharset)
++char *tag;
++struct searchargs *searchargs;
++int *charset;
++int parsecharset;
++{
++    static struct buf criteria, arg;
++    struct searchargs *sub1, *sub2;
++    char *p, *str;
++    int c, flag;
++    unsigned size;
++    time_t start, end;
++
++    c = getword(imapd_in, &criteria);
++    lcase(criteria.s);
++    switch (criteria.s[0]) {
++    case '\0':
++	if (c != '(') goto badcri;
++	c = getsearchprogram(tag, searchargs, charset, 0);
++	if (c == EOF) return EOF;
++	if (c != ')') {
++	    prot_printf(imapd_out, "%s BAD Missing required close paren in Search command\r\n",
++		   tag);
++	    if (c != EOF) prot_ungetc(c, imapd_in);
++	    return EOF;
++	}
++	c = prot_getc(imapd_in);
++	break;
++
++    case '0': case '1': case '2': case '3': case '4':
++    case '5': case '6': case '7': case '8': case '9':
++    case '*':
++	if (imparse_issequence(criteria.s)) {
++	    appendstrlist(&searchargs->sequence, criteria.s);
++	}
++	else goto badcri;
++	break;
++
++    case 'a':
++	if (!strcmp(criteria.s, "answered")) {
++	    searchargs->system_flags_set |= FLAG_ANSWERED;
++	}
++	else if (!strcmp(criteria.s, "all")) {
++	    break;
++	}
++	else goto badcri;
++	break;
++
++    case 'b':
++	if (!strcmp(criteria.s, "before")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->before || searchargs->before > start) {
++		searchargs->before = start;
++	    }
++	}
++	else if (!strcmp(criteria.s, "bcc")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->bcc, str);
++	    }
++	}
++	else if (!strcmp(criteria.s, "body")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->body, str);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 'c':
++	if (!strcmp(criteria.s, "cc")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->cc, str);
++	    }
++	}
++	else if (parsecharset && !strcmp(criteria.s, "charset")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c != ' ') goto missingarg;
++	    lcase(arg.s);
++	    *charset = charset_lookupname(arg.s);
++	}
++	else goto badcri;
++	break;
++
++    case 'd':
++	if (!strcmp(criteria.s, "deleted")) {
++	    searchargs->system_flags_set |= FLAG_DELETED;
++	}
++	else if (!strcmp(criteria.s, "draft")) {
++	    searchargs->system_flags_set |= FLAG_DRAFT;
++	}
++	else goto badcri;
++	break;
++
++    case 'f':
++	if (!strcmp(criteria.s, "flagged")) {
++	    searchargs->system_flags_set |= FLAG_FLAGGED;
++	}
++	else if (!strcmp(criteria.s, "from")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->from, str);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 'h':
++	if (!strcmp(criteria.s, "header")) {
++	    struct strlist **patlist;
++
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c != ' ') goto missingarg;
++	    lcase(arg.s);
++
++	    /* some headers can be reduced to search terms */
++            if (!strcmp(arg.s, "bcc")) {
++                patlist = &searchargs->bcc;
++            }
++            else if (!strcmp(arg.s, "cc")) {
++		patlist = &searchargs->cc;
++            }
++	    else if (!strcmp(arg.s, "to")) {
++		patlist = &searchargs->to;
++            }
++	    else if (!strcmp(arg.s, "from")) {
++		patlist = &searchargs->from;
++            }
++	    else if (!strcmp(arg.s, "subject")) {
++		patlist = &searchargs->subject;
++            }
++
++	    /* we look message-id up in the envelope */
++	    else if (!strcmp(arg.s, "message-id")) {
++		patlist = &searchargs->messageid;
++	    }
++
++	    /* all other headers we handle normally */
++	    else {
++		if (searchargs->cache_atleast < BIT32_MAX) {
++		    bit32 this_ver =
++			mailbox_cached_header(arg.s);
++		    if(this_ver > searchargs->cache_atleast)
++			searchargs->cache_atleast = this_ver;
++		}
++		appendstrlist(&searchargs->header_name, arg.s);
++		patlist = &searchargs->header;
++	    }
++
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(patlist, str);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 'k':
++	if (!strcmp(criteria.s, "keyword")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getword(imapd_in, &arg);
++	    if (!imparse_isatom(arg.s)) goto badflag;
++	    lcase(arg.s);
++	    for (flag=0; flag < MAX_USER_FLAGS; flag++) {
++		if (imapd_mailbox->flagname[flag] &&
++		    !strcasecmp(imapd_mailbox->flagname[flag], arg.s)) break;
++	    }
++	    if (flag == MAX_USER_FLAGS) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++		break;
++	    }
++	    searchargs->user_flags_set[flag/32] |= 1<<(flag&31);
++	}
++	else goto badcri;
++	break;
++
++    case 'l':
++	if (!strcmp(criteria.s, "larger")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getword(imapd_in, &arg);
++	    size = 0;
++	    for (p = arg.s; *p && isdigit((int) *p); p++) {
++		size = size * 10 + *p - '0';
++                /* if (size < 0) goto badnumber; */
++	    }
++	    if (!arg.s || *p) goto badnumber;
++	    if (size > searchargs->larger) searchargs->larger = size;
++	}
++	else goto badcri;
++	break;
++
++    case 'n':
++	if (!strcmp(criteria.s, "not")) {
++	    if (c != ' ') goto missingarg;		
++	    sub1 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++	    c = getsearchcriteria(tag, sub1, charset, 0);
++	    if (c == EOF) {
++		freesearchargs(sub1);
++		return EOF;
++	    }
++
++	    appendsearchargs(searchargs, sub1, (struct searchargs *)0);
++	}
++	else if (!strcmp(criteria.s, "new")) {
++	    searchargs->flags |= (SEARCH_SEEN_UNSET|SEARCH_RECENT_SET);
++	}
++	else goto badcri;
++	break;
++
++    case 'o':
++	if (!strcmp(criteria.s, "or")) {
++	    if (c != ' ') goto missingarg;		
++	    sub1 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++	    c = getsearchcriteria(tag, sub1, charset, 0);
++	    if (c == EOF) {
++		freesearchargs(sub1);
++		return EOF;
++	    }
++	    if (c != ' ') goto missingarg;		
++	    sub2 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
++	    c = getsearchcriteria(tag, sub2, charset, 0);
++	    if (c == EOF) {
++		freesearchargs(sub1);
++		freesearchargs(sub2);
++		return EOF;
++	    }
++	    appendsearchargs(searchargs, sub1, sub2);
++	}
++	else if (!strcmp(criteria.s, "old")) {
++	    searchargs->flags |= SEARCH_RECENT_UNSET;
++	}
++	else if (!strcmp(criteria.s, "on")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->before || searchargs->before > end) {
++		searchargs->before = end;
++	    }
++	    if (!searchargs->after || searchargs->after < start) {
++		searchargs->after = start;
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 'r':
++	if (!strcmp(criteria.s, "recent")) {
++	    searchargs->flags |= SEARCH_RECENT_SET;
++	}
++	else goto badcri;
++	break;
++
++    case 's':
++	if (!strcmp(criteria.s, "seen")) {
++	    searchargs->flags |= SEARCH_SEEN_SET;
++	}
++	else if (!strcmp(criteria.s, "sentbefore")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->sentbefore || searchargs->sentbefore > start) {
++		searchargs->sentbefore = start;
++	    }
++	}
++	else if (!strcmp(criteria.s, "senton")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->sentbefore || searchargs->sentbefore > end) {
++		searchargs->sentbefore = end;
++	    }
++	    if (!searchargs->sentafter || searchargs->sentafter < start) {
++		searchargs->sentafter = start;
++	    }
++	}
++	else if (!strcmp(criteria.s, "sentsince")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->sentafter || searchargs->sentafter < start) {
++		searchargs->sentafter = start;
++	    }
++	}
++	else if (!strcmp(criteria.s, "since")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getsearchdate(&start, &end);
++	    if (c == EOF) goto baddate;
++	    if (!searchargs->after || searchargs->after < start) {
++		searchargs->after = start;
++	    }
++	}
++	else if (!strcmp(criteria.s, "smaller")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getword(imapd_in, &arg);
++	    size = 0;
++	    for (p = arg.s; *p && isdigit((int) *p); p++) {
++		size = size * 10 + *p - '0';
++                /* if (size < 0) goto badnumber; */
++	    }
++	    if (!arg.s || *p) goto badnumber;
++	    if (size == 0) size = 1;
++	    if (!searchargs->smaller || size < searchargs->smaller)
++	      searchargs->smaller = size;
++	}
++	else if (!strcmp(criteria.s, "subject")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->subject, str);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 't':
++	if (!strcmp(criteria.s, "to")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->to, str);
++	    }
++	}
++	else if (!strcmp(criteria.s, "text")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getastring(imapd_in, imapd_out, &arg);
++	    if (c == EOF) goto missingarg;
++	    str = charset_convert(arg.s, *charset, NULL, 0);
++	    if (strchr(str, EMPTY)) {
++		/* Force failure */
++		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
++	    }
++	    else {
++		appendstrlistpat(&searchargs->text, str);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    case 'u':
++	if (!strcmp(criteria.s, "uid")) {
++	    if (c != ' ') goto missingarg;
++	    c = getword(imapd_in, &arg);
++	    if (!imparse_issequence(arg.s)) goto badcri;
++	    appendstrlist(&searchargs->uidsequence, arg.s);
++	}
++	else if (!strcmp(criteria.s, "unseen")) {
++	    searchargs->flags |= SEARCH_SEEN_UNSET;
++	}
++	else if (!strcmp(criteria.s, "unanswered")) {
++	    searchargs->system_flags_unset |= FLAG_ANSWERED;
++	}
++	else if (!strcmp(criteria.s, "undeleted")) {
++	    searchargs->system_flags_unset |= FLAG_DELETED;
++	}
++	else if (!strcmp(criteria.s, "undraft")) {
++	    searchargs->system_flags_unset |= FLAG_DRAFT;
++	}
++	else if (!strcmp(criteria.s, "unflagged")) {
++	    searchargs->system_flags_unset |= FLAG_FLAGGED;
++	}
++	else if (!strcmp(criteria.s, "unkeyword")) {
++	    if (c != ' ') goto missingarg;		
++	    c = getword(imapd_in, &arg);
++	    if (!imparse_isatom(arg.s)) goto badflag;
++	    lcase(arg.s);
++	    for (flag=0; flag < MAX_USER_FLAGS; flag++) {
++		if (imapd_mailbox->flagname[flag] &&
++		    !strcasecmp(imapd_mailbox->flagname[flag], arg.s)) break;
++	    }
++	    if (flag != MAX_USER_FLAGS) {
++		searchargs->user_flags_unset[flag/32] |= 1<<(flag&31);
++	    }
++	}
++	else goto badcri;
++	break;
++
++    default:
++    badcri:
++	prot_printf(imapd_out, "%s BAD Invalid Search criteria\r\n", tag);
++	if (c != EOF) prot_ungetc(c, imapd_in);
++	return EOF;
++    }
++
++    return c;
++
++ missingarg:
++    prot_printf(imapd_out, "%s BAD Missing required argument to Search %s\r\n",
++	   tag, criteria.s);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++
++ badflag:
++    prot_printf(imapd_out, "%s BAD Invalid flag name %s in Search command\r\n",
++	   tag, arg.s);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++
++ baddate:
++    prot_printf(imapd_out, "%s BAD Invalid date in Search command\r\n", tag);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++
++ badnumber:
++    prot_printf(imapd_out, "%s BAD Invalid number in Search command\r\n", tag);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++}
++
++void cmd_dump(char *tag, char *name, int uid_start) 
++{
++    int r = 0;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char *path, *acl;
++
++    /* administrators only please */
++    if (!imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++    
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, &path, NULL, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if(!r) {
++	r = dump_mailbox(tag, mailboxname, path, acl, uid_start, imapd_in,
++			 imapd_out, imapd_authstate);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}
++
++void cmd_undump(char *tag, char *name) 
++{
++    int r = 0;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char *path, *acl;
++
++    /* administrators only please */
++    if (!imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++    
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, &path, NULL, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    if(!r) {
++	/* save this stuff from additional mlookups */
++	char *safe_path = xstrdup(path);
++	char *safe_acl = xstrdup(acl);
++	r = undump_mailbox(mailboxname, safe_path, safe_acl,
++			   imapd_in, imapd_out,
++			   imapd_authstate);
++	free(safe_path);
++	free(safe_acl);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s%s\r\n",
++		    tag,
++		    (r == IMAP_MAILBOX_NONEXISTENT &&
++		     mboxlist_createmailboxcheck(mailboxname, 0, 0,
++						 imapd_userisadmin,
++						 imapd_userid, imapd_authstate,
++						 NULL, NULL) == 0)
++		    ? "[TRYCREATE] " : "", error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}
++
++static int getresult(struct protstream *p, char *tag) 
++{
++    char buf[4096];
++    char *str = (char *) buf;
++    
++    while(1) {
++	if (!prot_fgets(str, sizeof(buf), p)) {
++	    return IMAP_SERVER_UNAVAILABLE;
++	}
++	if (!strncmp(str, tag, strlen(tag))) {
++	    str += strlen(tag);
++	    if(!*str) {
++		/* We got a tag, but no response */
++		return IMAP_SERVER_UNAVAILABLE;
++	    }
++	    str++;
++	    if (!strncasecmp(str, "OK ", 3)) { return 0; }
++	    if (!strncasecmp(str, "NO ", 3)) { return IMAP_REMOTE_DENIED; }
++	    return IMAP_SERVER_UNAVAILABLE; /* huh? */
++	}
++	/* skip this line, we don't really care */
++    }
++}
++
++/* given 2 protstreams and a mailbox, gets the acl and then wipes it */
++static int trashacl(struct protstream *pin, struct protstream *pout,
++		    char *mailbox) 
++{
++    int i=0, j=0;
++    char tagbuf[128];
++    int c;		/* getword() returns an int */
++    struct buf tag, cmd, tmp, user;
++    int r = 0;
++
++    memset(&tag, 0, sizeof(struct buf));
++    memset(&cmd, 0, sizeof(struct buf));
++    memset(&tmp, 0, sizeof(struct buf));
++    memset(&user, 0, sizeof(struct buf));
++
++    prot_printf(pout, "ACL0 GETACL {%lu+}\r\n%s\r\n",
++		(unsigned long) strlen(mailbox), mailbox);
++
++    while(1) {
++	c = getword(pin, &tag);
++	if (c == EOF) {
++	    r = IMAP_SERVER_UNAVAILABLE;
++	    break;
++	}
++
++	c = getword(pin, &cmd);
++	if (c == EOF) {
++	    r = IMAP_SERVER_UNAVAILABLE;
++	    break;
++	}
++	
++	if(c == '\r') {
++	    c = prot_getc(pin);
++	    if(c != '\n') {
++		r = IMAP_SERVER_UNAVAILABLE;
++		goto cleanup;
++	    }
++	}
++	if(c == '\n') goto cleanup;	
++
++	if (tag.s[0] == '*' && !strncmp(cmd.s, "ACL", 3)) {
++	    while(c != '\n') {
++		/* An ACL response, we should send a DELETEACL command */
++		c = getastring(pin, pout, &tmp);
++		if (c == EOF) {
++		    r = IMAP_SERVER_UNAVAILABLE;
++		    goto cleanup;
++		}
++
++		if(c == '\r') {
++		    c = prot_getc(pin);
++		    if(c != '\n') {
++			r = IMAP_SERVER_UNAVAILABLE;
++			goto cleanup;
++		    }
++		}
++		if(c == '\n') goto cleanup;
++		
++		c = getastring(pin, pout, &user);
++		if (c == EOF) {
++		    r = IMAP_SERVER_UNAVAILABLE;
++		    goto cleanup;
++		}
++
++		snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
++		
++		prot_printf(pout, "%s DELETEACL {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			    tagbuf, (unsigned long) strlen(mailbox), mailbox,
++			    (unsigned long) strlen(user.s), user.s);
++		if(c == '\r') {
++		    c = prot_getc(pin);
++		    if(c != '\n') {
++			r = IMAP_SERVER_UNAVAILABLE;
++			goto cleanup;
++		    }
++		}
++		/* if the next character is \n, we'll exit the loop */
++	    }
++	    continue;
++	} else if (!strncmp(tag.s, "ACL0", 4)) {
++	    /* end of this command */
++	    if (!strcasecmp(cmd.s, "OK")) { break; }
++	    if (!strcasecmp(cmd.s, "NO")) { r = IMAP_REMOTE_DENIED; break; }
++	    r = IMAP_SERVER_UNAVAILABLE;
++	    break;
++	}
++    }
++
++    cleanup:
++
++    /* Now cleanup after all the DELETEACL commands */
++    if(!r) {
++	while(j < i) {
++	    c = getword(pin, &tag);
++	    if (c == EOF) {
++		r = IMAP_SERVER_UNAVAILABLE;
++		break;
++	    }
++	    
++	    eatline(pin, c);
++	    
++	    if(!strncmp("ACL", tag.s, 3)) {
++		j++;
++	    }
++	}
++    }
++
++    if(r) eatline(pin, c);
++
++    freebuf(&user);
++    freebuf(&tmp);
++    freebuf(&cmd);
++    freebuf(&tag);
++
++    return r;
++}
++
++static int dumpacl(struct protstream *pin, struct protstream *pout,
++		   char *mailbox, char *acl_in) 
++{
++    int r = 0;
++    int c;		/* getword() returns an int */
++    char tag[128];
++    int tagnum = 1;
++    char *rights, *nextid;
++    int mailboxlen = strlen(mailbox);
++    char *acl_safe = acl_in ? xstrdup(acl_in) : NULL;
++    char *acl = acl_safe;
++    struct buf inbuf;
++    
++    memset(&inbuf, 0, sizeof(struct buf));
++
++    while (acl) {
++	rights = strchr(acl, '\t');
++	if (!rights) break;
++	*rights++ = '\0';
++	
++	nextid = strchr(rights, '\t');
++	if (!nextid) break;
++	*nextid++ = '\0';
++
++	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
++	
++	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++		    tag,
++		    mailboxlen, mailbox,
++		    (unsigned long) strlen(acl), acl,
++		    (unsigned long) strlen(rights), rights);
++
++	while(1) {
++	    c = getword(pin, &inbuf);
++	    if (c == EOF) {
++		r = IMAP_SERVER_UNAVAILABLE;
++		break;
++	    }
++	    if(strncmp(tag, inbuf.s, strlen(tag))) {
++		eatline(pin, c);
++		continue;
++	    } else {
++		/* this is our line */
++		break;
++	    }
++	}
++
++	/* Are we OK? */
++
++	c = getword(pin, &inbuf);
++	if (c == EOF) {
++	    r = IMAP_SERVER_UNAVAILABLE;
++	    break;
++	}
++
++	if(strncmp("OK", inbuf.s, 2)) {
++	    r = IMAP_REMOTE_DENIED;
++	    break;
++	}
++
++	/* Eat the line and get the next one */
++	eatline(pin, c);
++	acl = nextid;
++    }
++
++    freebuf(&inbuf);
++    if(acl_safe) free(acl_safe);
++
++    return r;
++}
++
++static int do_xfer_single(char *toserver, char *topart,
++			  char *name, char *mailboxname,
++			  int mbflags, 
++			  char *path, char *part, char *acl,
++			  int prereserved,
++			  mupdate_handle *h_in,
++			  struct backend *be_in) 
++{
++    int r = 0, rerr = 0;
++    char buf[MAX_PARTITION_LEN+HOSTNAME_SIZE+2];
++    struct backend *be = NULL;
++    mupdate_handle *mupdate_h = NULL;
++    int backout_mupdate = 0;
++    int backout_remotebox = 0;
++    int backout_remoteflag = 0;
++
++    /* Make sure we're given a sane value */
++    if(topart && !imparse_isatom(topart)) {
++	return IMAP_PARTITION_UNKNOWN;
++    }
++
++    if(!strcmp(toserver, config_servername)) {
++	return IMAP_BAD_SERVER;
++    }
++    
++    /* Okay, we have the mailbox, now the order of steps is:
++     *
++     * 1) Connect to remote server.
++     * 2) LOCALCREATE on remote server
++     * 2.5) Set mailbox as REMOTE on local server
++     * 3) mupdate.DEACTIVATE(mailbox, remoteserver) xxx what partition?
++     * 4) undump mailbox from local to remote
++     * 5) Sync remote acl
++     * 6) mupdate.ACTIVATE(mailbox, remoteserver)
++     * ** MAILBOX NOW LIVING ON REMOTE SERVER
++     * 6.5) force remote server to push the final mupdate entry to ensure
++     *      that the state of the world is correct (required if we do not
++     *      know the remote partition, but worst case it will be caught
++     *      when they next sync)
++     * 7) local delete of mailbox
++     * 8) remove local remote mailbox entry??????
++     */
++
++    /* Step 1: Connect to remote server */
++    if(!r && !be_in) {
++	/* Just authorize as the IMAP server, so pass "" as our authzid */
++	be = backend_connect(NULL, toserver, &protocol[PROTOCOL_IMAP], "", NULL);
++	if(!be) r = IMAP_SERVER_UNAVAILABLE;
++	if(r) syslog(LOG_ERR,
++		     "Could not move mailbox: %s, Backend connect failed",
++		     mailboxname);
++    } else if(!r) {
++	be = be_in;
++    }
++
++    /* Step 1a: Connect to mupdate (as needed) */
++    if(h_in) {
++	mupdate_h = h_in;
++    } else if (config_mupdate_server) {
++	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
++	if(r) {
++	    syslog(LOG_ERR,
++		   "Could not move mailbox: %s, MUPDATE connect failed",
++		   mailboxname);
++	    goto done;
++	}
++
++    }
++
++    /* Step 2: LOCALCREATE on remote server */
++    if(!r) {
++	if(topart) {
++	    /* need to send partition as an atom */
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s %s\r\n",
++			(unsigned long) strlen(name), name, topart);
++	} else {
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
++	}
++	r = getresult(be->in, "LC1");
++	if(r) syslog(LOG_ERR, "Could not move mailbox: %s, LOCALCREATE failed",
++		     mailboxname);
++	else backout_remotebox = 1;
++    }
++
++    /* Step 2.5: Set mailbox as REMOTE on local server */
++    if(!r) {
++	snprintf(buf, sizeof(buf), "%s!%s", toserver, part);
++	r = mboxlist_update(mailboxname, mbflags|MBTYPE_MOVING, buf, acl, 1);
++	if(r) syslog(LOG_ERR, "Could not move mailbox: %s, " \
++		     "mboxlist_update failed", mailboxname);
++    }
++
++    /* Step 3: mupdate.DEACTIVATE(mailbox, newserver) */
++    /* (only if mailbox has not been already deactivated by our caller) */
++    if(!r && mupdate_h && !prereserved) {
++	backout_remoteflag = 1;
++
++	/* Note we are making the reservation on OUR host so that recovery
++	 * make sense */
++	snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
++	r = mupdate_deactivate(mupdate_h, mailboxname, buf);
++	if(r) syslog(LOG_ERR,
++		     "Could not move mailbox: %s, MUPDATE DEACTIVATE failed",
++		     mailboxname);
++    }
++
++    /* Step 4: Dump local -> remote */
++    if(!r) {
++	backout_mupdate = 1;
++
++	prot_printf(be->out, "D01 UNDUMP {%lu+}\r\n%s ",
++		    (unsigned long) strlen(name), name);
++
++	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
++			 imapd_authstate);
++
++	if(r)
++	    syslog(LOG_ERR,
++		   "Could not move mailbox: %s, dump_mailbox() failed",
++		   mailboxname);
++    }
++
++    if(!r) {
++	r = getresult(be->in, "D01");
++	if(r) syslog(LOG_ERR, "Could not move mailbox: %s, UNDUMP failed",
++		     mailboxname);
++    }
++    
++    /* Step 5: Set ACL on remote */
++    if(!r) {
++	r = trashacl(be->in, be->out, name);
++	if(r) syslog(LOG_ERR, "Could not clear remote acl on %s",
++		     mailboxname);
++    }
++    if(!r) {
++	r = dumpacl(be->in, be->out, name, acl);
++	if(r) syslog(LOG_ERR, "Could not set remote acl on %s",
++		     mailboxname);
++    }
++
++    /* Step 6: mupdate.activate(mailbox, remote) */
++    /* We do this from the local server first so that recovery is easier */
++    if(!r && mupdate_h) {
++	/* Note the flag that we don't have a valid partiton at the moment */
++	snprintf(buf, sizeof(buf), "%s!MOVED", toserver);
++	r = mupdate_activate(mupdate_h, mailboxname, buf, acl);
++    }
++    
++    /* MAILBOX NOW LIVES ON REMOTE */
++    if(!r) {
++	backout_remotebox = 0;
++	backout_mupdate = 0;
++	backout_remoteflag = 0;
++
++	/* 6.5) Kick remote server to correct mupdate entry */
++	/* Note that we don't really care if this succeeds or not */
++	if (mupdate_h) {
++	    prot_printf(be->out, "MP1 MUPDATEPUSH {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
++	    rerr = getresult(be->in, "MP1");
++	    if(rerr) {
++		syslog(LOG_ERR,
++		       "Could not trigger remote push to mupdate server" \
++		       "during move of %s",
++		       mailboxname);
++	    }
++	}
++    }
++
++    /* 7) local delete of mailbox
++     * & remove local "remote" mailboxlist entry */
++    if(!r) {
++	/* Note that we do not check the ACL, and we don't update MUPDATE */
++	/* note also that we need to remember to let proxyadmins do this */
++	r = mboxlist_deletemailbox(mailboxname,
++				   imapd_userisadmin || imapd_userisproxyadmin,
++				   imapd_userid, imapd_authstate, 0, 1, 0);
++	if(r) syslog(LOG_ERR,
++		     "Could not delete local mailbox during move of %s",
++		     mailboxname);
++     }
++
++done:
++    if(r && mupdate_h && backout_mupdate) {
++	rerr = 0;
++	/* xxx if the mupdate server is what failed, then this won't
++	   help any! */
++	snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
++	rerr = mupdate_activate(mupdate_h, mailboxname, buf, acl);
++	if(rerr) {
++	    syslog(LOG_ERR,
++		   "Could not back out mupdate during move of %s (%s)",
++		   mailboxname, error_message(rerr));
++	}
++    }
++    if(r && backout_remotebox) {
++	rerr = 0;
++	prot_printf(be->out, "LD1 LOCALDELETE {%lu+}\r\n%s\r\n",
++		    (unsigned long) strlen(name), name);
++	rerr = getresult(be->in, "LD1");
++ 	if(rerr) {
++	    syslog(LOG_ERR,
++		   "Could not back out remote mailbox during move of %s (%s)",
++		   name, error_message(rerr));
++	}   
++    }
++    if(r && backout_remoteflag) {
++	rerr = 0;
++
++	rerr = mboxlist_update(mailboxname, mbflags, part, acl, 1);
++	if(rerr) syslog(LOG_ERR, "Could not unset remote flag on mailbox: %s",
++			mailboxname);
++    }
++
++    /* release the handles we got locally if necessary */
++    if(mupdate_h && !h_in)
++	mupdate_disconnect(&mupdate_h);
++    if(be && !be_in)
++	backend_disconnect(be, &protocol[PROTOCOL_IMAP]);
++
++    return r;
++}
++
++struct xfer_user_rock 
++{
++    char *toserver;
++    char *topart;
++    mupdate_handle *h;
++    struct backend *be;
++};
++
++static int xfer_user_cb(char *name,
++			int matchlen __attribute__((unused)),
++			int maycreate __attribute__((unused)),
++			void *rock) 
++{
++    mupdate_handle *mupdate_h = ((struct xfer_user_rock *)rock)->h;
++    char *toserver = ((struct xfer_user_rock *)rock)->toserver;
++    char *topart = ((struct xfer_user_rock *)rock)->topart;
++    struct backend *be = ((struct xfer_user_rock *)rock)->be;
++    char externalname[MAX_MAILBOX_NAME+1];
++    int mbflags;
++    int r = 0;
++    char *inpath, *inpart, *inacl;
++    char *path = NULL, *part = NULL, *acl = NULL;
++
++    if (!r) {
++	/* NOTE: NOT mlookup() because we don't want to issue a referral */
++	/* xxx but what happens if they are remote
++	 * mailboxes? */
++	r = mboxlist_detail(name, &mbflags,
++			    &inpath, &inpart, &inacl, NULL);
++    }
++    
++    if (!r) {
++	path = xstrdup(inpath);
++	part = xstrdup(inpart);
++	acl = xstrdup(inacl);
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
++						   name,
++						   imapd_userid,
++						   externalname);
++    }
++
++    if(!r) {
++	r = do_xfer_single(toserver, topart, externalname, name, mbflags,
++			   path, part, acl, 0, mupdate_h, be);
++    }
++
++    if(path) free(path);
++    if(part) free(part);
++    if(acl) free(acl);
++
++    return r;
++}
++
++
++void cmd_xfer(char *tag, char *name, char *toserver, char *topart)
++{
++    int r = 0;
++    char buf[MAX_PARTITION_LEN+HOSTNAME_SIZE+2];
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    int mbflags;
++    int moving_user = 0;
++    int backout_mupdate = 0;
++    mupdate_handle *mupdate_h = NULL;
++    char *inpath, *inpart, *inacl;
++    char *path = NULL, *part = NULL, *acl = NULL;
++    char *p, *mbox = mailboxname;
++    
++    /* administrators only please */
++    /* however, proxys can do this, if their authzid is an admin */
++    if (!imapd_userisadmin && !imapd_userisproxyadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace,
++						   name,
++						   imapd_userid,
++						   mailboxname);
++    }
++
++    /* NOTE: Since XFER can only be used by an admin, and we always connect
++     * to the destination backend as an admin, we take advantage of the fact
++     * that admins *always* use a consistent mailbox naming scheme.
++     * So, 'name' should be used in any command we send to a backend, and
++     * 'mailboxname' is the internal name to be used for mupdate and findall.
++     */
++
++    if (config_virtdomains && (p = strchr(mailboxname, '!'))) {
++	/* pointer to mailbox w/o domain prefix */
++	mbox = p + 1;
++    }
++
++    if(!strncmp(mbox, "user.", 5) && !strchr(mbox+5, '.')) {
++	if ((strlen(mbox+5) == (strlen(imapd_userid) - (mbox - mailboxname))) &&
++	    !strncmp(mbox+5, imapd_userid, strlen(mbox+5))) {
++	    /* don't move your own inbox, that could be troublesome */
++	    r = IMAP_MAILBOX_NOTSUPPORTED;
++	} else if (!config_getswitch(IMAPOPT_ALLOWUSERMOVES)) {
++	    /* not configured to allow user moves */
++	    r = IMAP_MAILBOX_NOTSUPPORTED;
++	} else {
++	    moving_user = 1;
++	}
++    }
++    
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, &mbflags,
++		    &inpath, &inpart, &inacl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++    
++    if (!r) {
++	path = xstrdup(inpath);
++	part = xstrdup(inpart);
++	acl = xstrdup(inacl);
++    }
++
++    /* if we are not moving a user, just move the one mailbox */
++    if(!r && !moving_user) {
++	r = do_xfer_single(toserver, topart, name, mailboxname, mbflags,
++			   path, part, acl, 0, NULL, NULL);
++    } else if (!r) {
++	struct backend *be = NULL;
++	
++	/* we need to reserve the users inbox - connect to mupdate */
++	if(!r && config_mupdate_server) {
++	    r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
++	    if(r) {
++		syslog(LOG_ERR,
++		       "Could not move mailbox: %s, MUPDATE connect failed",
++		       mailboxname);
++		goto done;
++	    }
++	}
++
++	/* Get a single connection to the remote backend */
++	be = backend_connect(NULL, toserver, &protocol[PROTOCOL_IMAP], "", NULL);
++	if(!be) {
++	    r = IMAP_SERVER_UNAVAILABLE;
++	    syslog(LOG_ERR,
++		   "Could not move mailbox: %s, " \
++		   "Initial backend connect failed",
++		   mailboxname);
++	}
++
++	/* deactivate their inbox */
++	if(!r && mupdate_h) {
++	    /* Note we are making the reservation on OUR host so that recovery
++	     * make sense */
++	    snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
++	    r = mupdate_deactivate(mupdate_h, mailboxname, buf);
++	    if(r) syslog(LOG_ERR,
++			 "Could deactivate mailbox: %s, during move",
++			 mailboxname);
++	    else backout_mupdate = 1;
++	}
++
++	/* If needed, set an uppermost quota root */
++	if(!r) {
++	    struct quota quota;
++	    
++	    quota.root = mailboxname;
++	    r = quota_read(&quota, NULL, 0);
++	    
++	    if(!r) {
++		/* note use of + to force the setting of a nonexistant
++		 * quotaroot */
++		prot_printf(be->out, "Q01 SETQUOTA {%lu+}\r\n" \
++			    "+%s (STORAGE %d)\r\n",
++			    (unsigned long) strlen(name)+1,
++			    name, quota.limit);
++		r = getresult(be->in, "Q01");
++		if(r) syslog(LOG_ERR,
++			     "Could not move mailbox: %s, " \
++			     "failed setting initial quota root\r\n",
++			     mailboxname);
++	    }
++	    else if (r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
++	}
++
++
++	/* recursively move all sub-mailboxes, using internal names */
++	if(!r) {
++	    struct xfer_user_rock rock;
++
++	    rock.toserver = toserver;
++	    rock.topart = topart;
++	    rock.h = mupdate_h;
++	    rock.be = be;
++
++	    snprintf(buf, sizeof(buf), "%s.*", mailboxname);
++	    r = mboxlist_findall(NULL, buf, 1, imapd_userid,
++				 imapd_authstate, xfer_user_cb,
++				 &rock);
++	}
++
++	/* xxx how do you back out if one of the above moves fails? */
++	    
++	/* move this mailbox */
++	/* ...and seen file, and subs file, and sieve scripts... */
++	if(!r) {
++	    r = do_xfer_single(toserver, topart, name, mailboxname, mbflags,
++			       path, part, acl, 1, mupdate_h, be);
++	}
++
++	if(be) {
++	    backend_disconnect(be, &protocol[PROTOCOL_IMAP]);
++	    free(be);
++	}
++
++	if(r && mupdate_h && backout_mupdate) {
++	    int rerr = 0;
++	    /* xxx if the mupdate server is what failed, then this won't
++	       help any! */
++	    snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
++	    rerr = mupdate_activate(mupdate_h, mailboxname, buf, acl);
++	    if(rerr) {
++		syslog(LOG_ERR,
++		       "Could not back out mupdate during move of %s (%s)",
++		       mailboxname, error_message(rerr));
++	    }
++	} else if(!r) {
++	    /* this was a successful user delete, and we need to delete
++	       certain user meta-data (but not seen state!) */
++	    user_deletedata(mailboxname+5, imapd_userid, imapd_authstate, 0);
++	}
++	
++	if(!r && mupdate_h) {
++	    mupdate_disconnect(&mupdate_h);
++	}
++    }
++
++ done:
++    if(part) free(part);
++    if(path) free(path);
++    if(acl) free(acl);
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n",
++		    tag,
++		    error_message(r));
++    } else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++
++    return;
++}
++
++/*
++ * Parse a "date", for SEARCH criteria
++ * The time_t's pointed to by 'start' and 'end' are set to the
++ * times of the start and end of the parsed date.
++ */
++int getsearchdate(start, end)
++time_t *start, *end;
++{
++    int c;
++    struct tm tm;
++    int quoted = 0;
++    char month[4];
++
++    memset(&tm, 0, sizeof tm);
++
++    c = prot_getc(imapd_in);
++    if (c == '\"') {
++	quoted++;
++	c = prot_getc(imapd_in);
++    }
++
++    /* Day of month */
++    if (!isdigit(c)) goto baddate;
++    tm.tm_mday = c - '0';
++    c = prot_getc(imapd_in);
++    if (isdigit(c)) {
++	tm.tm_mday = tm.tm_mday * 10 + c - '0';
++	c = prot_getc(imapd_in);
++    }
++    
++    if (c != '-') goto baddate;
++    c = prot_getc(imapd_in);
++
++    /* Month name */
++    if (!isalpha(c)) goto baddate;
++    month[0] = c;
++    c = prot_getc(imapd_in);
++    if (!isalpha(c)) goto baddate;
++    month[1] = c;
++    c = prot_getc(imapd_in);
++    if (!isalpha(c)) goto baddate;
++    month[2] = c;
++    c = prot_getc(imapd_in);
++    month[3] = '\0';
++    lcase(month);
++
++    for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
++	if (!strcmp(month, monthname[tm.tm_mon])) break;
++    }
++    if (tm.tm_mon == 12) goto baddate;
++
++    if (c != '-') goto baddate;
++    c = prot_getc(imapd_in);
++
++    /* Year */
++    if (!isdigit(c)) goto baddate;
++    tm.tm_year = c - '0';
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_year = tm.tm_year * 10 + c - '0';
++    c = prot_getc(imapd_in);
++    if (isdigit(c)) {
++	if (tm.tm_year < 19) goto baddate;
++	tm.tm_year -= 19;
++	tm.tm_year = tm.tm_year * 10 + c - '0';
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	tm.tm_year = tm.tm_year * 10 + c - '0';
++	c = prot_getc(imapd_in);
++    }
++
++    if (quoted) {
++	if (c != '\"') goto baddate;
++	c = prot_getc(imapd_in);
++    }
++
++    tm.tm_isdst = -1;
++    *start = mktime(&tm);
++
++    tm.tm_sec = tm.tm_min = 59;
++    tm.tm_hour = 23;
++    tm.tm_isdst = -1;
++    *end = mktime(&tm);
++
++    return c;
++
++ baddate:
++    prot_ungetc(c, imapd_in);
++    return EOF;
++}
++
++#define SORTGROWSIZE	10
++
++/*
++ * Parse sort criteria
++ */
++int getsortcriteria(char *tag, struct sortcrit **sortcrit)
++{
++    int c;
++    static struct buf criteria;
++    int nsort, n;
++
++    *sortcrit = NULL;
++
++    c = prot_getc(imapd_in);
++    if (c != '(') goto missingcrit;
++
++    c = getword(imapd_in, &criteria);
++    if (criteria.s[0] == '\0') goto missingcrit;
++
++    nsort = 0;
++    n = 0;
++    for (;;) {
++	if (n >= nsort - 1) {	/* leave room for implicit criterion */
++	    /* (Re)allocate an array for sort criteria */
++	    nsort += SORTGROWSIZE;
++	    *sortcrit =
++		(struct sortcrit *) xrealloc(*sortcrit,
++					     nsort * sizeof(struct sortcrit));
++	    /* Zero out the newly added sortcrit */
++	    memset((*sortcrit)+n, 0, SORTGROWSIZE * sizeof(struct sortcrit));
++	}
++
++	lcase(criteria.s);
++	if (!strcmp(criteria.s, "reverse")) {
++	    (*sortcrit)[n].flags |= SORT_REVERSE;
++	    goto nextcrit;
++	}
++	else if (!strcmp(criteria.s, "arrival"))
++	    (*sortcrit)[n].key = SORT_ARRIVAL;
++	else if (!strcmp(criteria.s, "cc"))
++	    (*sortcrit)[n].key = SORT_CC;
++	else if (!strcmp(criteria.s, "date"))
++	    (*sortcrit)[n].key = SORT_DATE;
++	else if (!strcmp(criteria.s, "from"))
++	    (*sortcrit)[n].key = SORT_FROM;
++	else if (!strcmp(criteria.s, "size"))
++	    (*sortcrit)[n].key = SORT_SIZE;
++	else if (!strcmp(criteria.s, "subject"))
++	    (*sortcrit)[n].key = SORT_SUBJECT;
++	else if (!strcmp(criteria.s, "to"))
++	    (*sortcrit)[n].key = SORT_TO;
++#if 0
++	else if (!strcmp(criteria.s, "annotation")) {
++	    (*sortcrit)[n].key = SORT_ANNOTATION;
++	    if (c != ' ') goto missingarg;
++	    c = getstring(imapd_in, &arg);
++	    if (c != ' ') goto missingarg;
++	    (*sortcrit)[n].args.annot.entry = xstrdup(arg.s);
++	    c = getstring(imapd_in, &arg);
++	    if (c == EOF) goto missingarg;
++	    (*sortcrit)[n].args.annot.attrib = xstrdup(arg.s);
++	}
++#endif
++	else {
++	    prot_printf(imapd_out, "%s BAD Invalid Sort criterion %s\r\n",
++			tag, criteria.s);
++	    if (c != EOF) prot_ungetc(c, imapd_in);
++	    return EOF;
++	}
++
++	n++;
++
++ nextcrit:
++	if (c == ' ') c = getword(imapd_in, &criteria);
++	else break;
++    }
++
++    if ((*sortcrit)[n].flags & SORT_REVERSE  && !(*sortcrit)[n].key) {
++	prot_printf(imapd_out,
++		    "%s BAD Missing Sort criterion to reverse\r\n", tag);
++	if (c != EOF) prot_ungetc(c, imapd_in);
++	return EOF;
++    }
++
++    if (c != ')') {
++	prot_printf(imapd_out,
++		    "%s BAD Missing close parenthesis in Sort\r\n", tag);
++	if (c != EOF) prot_ungetc(c, imapd_in);
++	return EOF;
++    }
++
++    /* Terminate the list with the implicit sort criterion */
++    (*sortcrit)[n++].key = SORT_SEQUENCE;
++
++    c = prot_getc(imapd_in);
++
++    return c;
++
++ missingcrit:
++    prot_printf(imapd_out, "%s BAD Missing Sort criteria\r\n", tag);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++#if 0 /* For annotations stuff above */
++ missingarg:
++    prot_printf(imapd_out, "%s BAD Missing argument to Sort criterion %s\r\n",
++		tag, criteria.s);
++    if (c != EOF) prot_ungetc(c, imapd_in);
++    return EOF;
++#endif
++}
++
++#ifdef ENABLE_LISTEXT
++/*
++ * Parse LIST options.
++ * The command has been parsed up to and including the opening '('.
++ */
++int getlistopts(char *tag, int *listopts)
++{
++    int c;
++    static struct buf arg;
++
++    *listopts = LIST_EXT;
++
++    for (;;) {
++	c = getword(imapd_in, &arg);
++	if (!arg.s[0]) break;
++
++	lcase(arg.s);
++	if (!strcmp(arg.s, "subscribed")) {
++	    *listopts |= LIST_SUBSCRIBED;
++	}
++	else if (!strcmp(arg.s, "children")) {
++	    *listopts |= LIST_CHILDREN;
++	}
++	else if (!strcmp(arg.s, "remote")) {
++	    *listopts |= LIST_REMOTE;
++	}
++	else {
++	    prot_printf(imapd_out, "%s BAD Invalid List option %s\r\n",
++			tag, arg.s);
++	    return EOF;
++	}
++
++	if (c != ' ') break;
++    }
++
++    if (c != ')') {
++	prot_printf(imapd_out,
++		    "%s BAD Missing close parenthesis in List\r\n", tag);
++	return EOF;
++    }
++
++    c = prot_getc(imapd_in);
++
++    return c;
++}
++#endif /* ENABLE_LISTEXT */
++
++/*
++ * Parse a date_time, for the APPEND command
++ */
++int getdatetime(date)
++time_t *date;
++{
++    int c;
++    struct tm tm;
++    int old_format = 0;
++    char month[4], zone[4], *p;
++    time_t tmp_gmtime;
++    int zone_off;
++
++    memset(&tm, 0, sizeof tm);
++
++    c = prot_getc(imapd_in);
++    if (c != '\"') goto baddate;
++    
++    /* Day of month */
++    c = prot_getc(imapd_in);
++    if (c == ' ') c = '0';
++    if (!isdigit(c)) goto baddate;
++    tm.tm_mday = c - '0';
++    c = prot_getc(imapd_in);
++    if (isdigit(c)) {
++	tm.tm_mday = tm.tm_mday * 10 + c - '0';
++	c = prot_getc(imapd_in);
++	if(tm.tm_mday <= 0 || tm.tm_mday > 31)
++	    goto baddate;
++    }
++    
++    if (c != '-') goto baddate;
++    c = prot_getc(imapd_in);
++
++    /* Month name */
++    if (!isalpha(c)) goto baddate;
++    month[0] = c;
++    c = prot_getc(imapd_in);
++    if (!isalpha(c)) goto baddate;
++    month[1] = c;
++    c = prot_getc(imapd_in);
++    if (!isalpha(c)) goto baddate;
++    month[2] = c;
++    c = prot_getc(imapd_in);
++    month[3] = '\0';
++    lcase(month);
++
++    for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
++	if (!strcmp(month, monthname[tm.tm_mon])) break;
++    }
++    if (tm.tm_mon == 12) goto baddate;
++    /* xxx this doesn't quite work in leap years */
++    if (tm.tm_mday > max_monthdays[tm.tm_mon]) goto baddate;
++
++    if (c != '-') goto baddate;
++    c = prot_getc(imapd_in);
++
++    /* Year */
++    if (!isdigit(c)) goto baddate;
++    tm.tm_year = c - '0';
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_year = tm.tm_year * 10 + c - '0';
++    c = prot_getc(imapd_in);
++    if (isdigit(c)) {
++	if (tm.tm_year < 19) goto baddate;
++	tm.tm_year -= 19;
++	tm.tm_year = tm.tm_year * 10 + c - '0';
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	tm.tm_year = tm.tm_year * 10 + c - '0';
++	c = prot_getc(imapd_in);
++    }
++    else old_format++;
++
++    /* Hour */
++    if (c != ' ') goto baddate;
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_hour = c - '0';
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_hour = tm.tm_hour * 10 + c - '0';
++    c = prot_getc(imapd_in);
++    if (tm.tm_hour > 23) goto baddate;
++
++    /* Minute */
++    if (c != ':') goto baddate;
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_min = c - '0';
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_min = tm.tm_min * 10 + c - '0';
++    c = prot_getc(imapd_in);
++    if (tm.tm_min > 59) goto baddate;
++
++    /* Second */
++    if (c != ':') goto baddate;
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_sec = c - '0';
++    c = prot_getc(imapd_in);
++    if (!isdigit(c)) goto baddate;
++    tm.tm_sec = tm.tm_sec * 10 + c - '0';
++    c = prot_getc(imapd_in);
++    if (tm.tm_min > 60) goto baddate;
++
++    /* Time zone */
++    if (old_format) {
++	if (c != '-') goto baddate;
++	c = prot_getc(imapd_in);
++
++	if (!isalpha(c)) goto baddate;
++	zone[0] = c;
++	c = prot_getc(imapd_in);
++
++	if (c == '\"') {
++	    /* Military (single-char) zones */
++	    zone[1] = '\0';
++	    lcase(zone);
++	    if (zone[0] <= 'm') {
++		zone_off = (zone[0] - 'a' + 1)*60;
++	    }
++	    else if (zone[0] < 'z') {
++		zone_off = ('m' - zone[0])*60;
++	    }
++	    else zone_off = 0;
++	}
++	else {
++	    /* UT (universal time) */
++	    zone[1] = c;
++	    c = prot_getc(imapd_in);
++	    if (c == '\"') {
++		zone[2] = '\0';
++		lcase(zone);
++		if (!strcmp(zone, "ut")) goto baddate;
++		zone_off = 0;
++	    }
++	    else {
++		/* 3-char time zone */
++		zone[2] = c;
++		c = prot_getc(imapd_in);
++		if (c != '\"') goto baddate;
++		zone[3] = '\0';
++		lcase(zone);
++		p = strchr("aecmpyhb", zone[0]);
++		if (c != '\"' || zone[2] != 't' || !p) goto baddate;
++		zone_off = (strlen(p) - 12)*60;
++		if (zone[1] == 'd') zone_off -= 60;
++		else if (zone[1] != 's') goto baddate;
++	    }
++	}
++    }
++    else {
++	if (c != ' ') goto baddate;
++	c = prot_getc(imapd_in);
++
++	if (c != '+' && c != '-') goto baddate;
++	zone[0] = c;
++
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	zone_off = c - '0';
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	zone_off = zone_off * 10 + c - '0';
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	zone_off = zone_off * 6 + c - '0';
++	c = prot_getc(imapd_in);
++	if (!isdigit(c)) goto baddate;
++	zone_off = zone_off * 10 + c - '0';
++
++	if (zone[0] == '-') zone_off = -zone_off;
++
++	c = prot_getc(imapd_in);
++	if (c != '\"') goto baddate;
++
++    }
++
++    c = prot_getc(imapd_in);
++
++    tm.tm_isdst = -1;
++
++    tmp_gmtime = mkgmtime(&tm);
++    if(tmp_gmtime == -1) goto baddate;
++
++    *date = tmp_gmtime - zone_off*60;
++
++    return c;
++
++ baddate:
++    prot_ungetc(c, imapd_in);
++    return EOF;
++}
++
++/*
++ * Print 's' as a quoted-string or literal (but not an atom)
++ */
++void
++printstring(s)
++const char *s;
++{
++    const char *p;
++    int len = 0;
++
++    /* Look for any non-QCHAR characters */
++    for (p = s; *p && len < 1024; p++) {
++	len++;
++	if (*p & 0x80 || *p == '\r' || *p == '\n'
++	    || *p == '\"' || *p == '%' || *p == '\\') break;
++    }
++
++    /* if it's too long, literal it */
++    if (*p || len >= 1024) {
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
++    } else {
++	prot_printf(imapd_out, "\"%s\"", s);
++    }
++}
++
++/*
++ * Print 's' as an atom, quoted-string, or literal
++ */
++void
++printastring(s)
++const char *s;
++{
++    const char *p;
++    int len = 0;
++
++    if (imparse_isatom(s)) {
++	prot_printf(imapd_out, "%s", s);
++	return;
++    }
++
++    /* Look for any non-QCHAR characters */
++    for (p = s; *p && len < 1024; p++) {
++	len++;
++	if (*p & 0x80 || *p == '\r' || *p == '\n'
++	    || *p == '\"' || *p == '%' || *p == '\\') break;
++    }
++
++    /* if it's too long, literal it */
++    if (*p || len >= 1024) {
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
++    } else {
++	prot_printf(imapd_out, "\"%s\"", s);
++    }
++}
++
++/*
++ * Append 'section', 'fields', 'trail' to the fieldlist 'l'.
++ */
++void
++appendfieldlist(struct fieldlist **l, char *section,
++		struct strlist *fields, char *trail,
++		void *d, size_t size)
++{
++    struct fieldlist **tail = l;
++
++    while (*tail) tail = &(*tail)->next;
++
++    *tail = (struct fieldlist *)xmalloc(sizeof(struct fieldlist));
++    (*tail)->section = xstrdup(section);
++    (*tail)->fields = fields;
++    (*tail)->trail = xstrdup(trail);
++    if(d && size) {
++	(*tail)->rock = xmalloc(size);
++	memcpy((*tail)->rock, d, size);
++    } else {
++	(*tail)->rock = NULL;
++    }
++    (*tail)->next = 0;
++}
++
++
++/*
++ * Free the fieldlist 'l'
++ */
++void freefieldlist(struct fieldlist *l)
++{
++    struct fieldlist *n;
++
++    while (l) {
++	n = l->next;
++	free(l->section);
++	freestrlist(l->fields);
++	free(l->trail);
++	if (l->rock) free(l->rock);
++	free((char *)l);
++	l = n;
++    }
++}
++
++/*
++ * Append the searchargs 's1' and 's2' to the sublist of 's'
++ */
++void
++appendsearchargs(s, s1, s2)
++struct searchargs *s, *s1, *s2;
++{
++    struct searchsub **tail = &s->sublist;
++
++    while (*tail) tail = &(*tail)->next;
++
++    *tail = (struct searchsub *)xmalloc(sizeof(struct searchsub));
++    (*tail)->sub1 = s1;
++    (*tail)->sub2 = s2;
++    (*tail)->next = 0;
++}
++
++
++/*
++ * Free the searchargs 's'
++ */
++void
++freesearchargs(s)
++struct searchargs *s;
++{
++    struct searchsub *sub, *n;
++
++    if (!s) return;
++
++    freestrlist(s->sequence);
++    freestrlist(s->uidsequence);
++    freestrlist(s->from);
++    freestrlist(s->to);
++    freestrlist(s->cc);
++    freestrlist(s->bcc);
++    freestrlist(s->subject);
++    freestrlist(s->body);
++    freestrlist(s->text);
++    freestrlist(s->header_name);
++    freestrlist(s->header);
++
++    for (sub = s->sublist; sub; sub = n) {
++	n = sub->next;
++	freesearchargs(sub->sub1);
++	freesearchargs(sub->sub2);
++	free(sub);
++    }
++    free(s);
++}
++
++/*
++ * Free an array of sortcrit
++ */
++static void freesortcrit(struct sortcrit *s)
++{
++    int i = 0;
++
++    if (!s) return;
++    do {
++	switch (s[i].key) {
++	case SORT_ANNOTATION:
++	    free(s[i].args.annot.entry);
++	    free(s[i].args.annot.attrib);
++	    break;
++	}
++	i++;
++    } while (s[i].key != SORT_SEQUENCE);
++    free(s);
++}
++
++/*
++ * Issue a MAILBOX untagged response
++ */
++static int mailboxdata(char *name,
++		       int matchlen __attribute__((unused)),
++		       int maycreate __attribute__((unused)),
++		       void *rock __attribute__((unused)))
++{
++    char mboxname[MAX_MAILBOX_PATH+1];
++
++    (*imapd_namespace.mboxname_toexternal)(&imapd_namespace, name,
++					   imapd_userid, mboxname);
++    prot_printf(imapd_out, "* MAILBOX %s\r\n", mboxname);
++    return 0;
++}
++
++/*
++ * Issue a LIST or LSUB untagged response
++ */
++static void mstringdata(char *cmd, char *name, int matchlen, int maycreate,
++			int listopts)
++{
++    static char lastname[MAX_MAILBOX_PATH+1];
++    static int lastnamedelayed = 0;
++    static int lastnamenoinferiors = 0;
++    static int nonexistent = 0;
++    static int sawuser = 0;
++    int lastnamehassub = 0;
++    int c, mbtype;
++    char mboxname[MAX_MAILBOX_PATH+1];
++
++    /* We have to reset the sawuser flag before each list command.
++     * Handle it as a dirty hack.
++     */
++    if (cmd == NULL) {
++	sawuser = 0;
++	mstringdatacalls = 0;
++	return;
++    }
++    mstringdatacalls++;
++
++    if (lastnamedelayed) {
++	/* Check if lastname has children */
++	if (name && strncmp(lastname, name, strlen(lastname)) == 0 &&
++	    name[strlen(lastname)] == '.') {
++	    lastnamehassub = 1;
++	}
++	prot_printf(imapd_out, "* %s (", cmd);
++	if (nonexistent == IMAP_MAILBOX_RESERVED) {
++	    /* LISTEXT wants \\PlaceHolder instead of \\Noselect */
++	    if (listopts & LIST_EXT)
++		prot_printf(imapd_out, "\\PlaceHolder");
++	    else
++		prot_printf(imapd_out, "\\Noselect");
++	} else if (nonexistent) {
++	    prot_printf(imapd_out, "\\NonExistent");
++	}
++	if (lastnamenoinferiors) {
++	    prot_printf(imapd_out, "%s\\Noinferiors", nonexistent ? " " : "");
++	}
++	else if ((listopts & LIST_CHILDREN) &&
++		 /* we can't determine \HasNoChildren for subscriptions */
++		 (lastnamehassub ||
++		  !(listopts & (LIST_LSUB | LIST_SUBSCRIBED)))) {
++	    prot_printf(imapd_out, "%s%s", nonexistent ? " " : "",
++			lastnamehassub ? "\\HasChildren" : "\\HasNoChildren");
++	}
++	prot_printf(imapd_out, ") \"%c\" ", imapd_namespace.hier_sep);
++		    
++	(*imapd_namespace.mboxname_toexternal)(&imapd_namespace, lastname,
++					       imapd_userid, mboxname);
++	printstring(mboxname);
++	prot_printf(imapd_out, "\r\n");
++	lastnamedelayed = lastnamenoinferiors = nonexistent = 0;
++    }
++
++    /* Special-case to flush any final state */
++    if (!name) {
++	lastname[0] = '\0';
++	return;
++    }
++
++    /* Suppress any output of a partial match */
++    if ((name[matchlen]
++	 && strncmp(lastname, name, matchlen) == 0
++	 && (lastname[matchlen] == '\0' || lastname[matchlen] == '.'))) {
++	return;
++    }
++	
++    /*
++     * We can get a partial match for "user" multiple times with
++     * other matches inbetween.  Handle it as a special case
++     */
++    if (matchlen == 4 && strncasecmp(name, "user", 4) == 0) {
++	if (sawuser) return;
++	sawuser = 1;
++    }
++
++    strlcpy(lastname, name, sizeof(lastname));
++    lastname[matchlen] = '\0';
++    nonexistent = 0;
++
++    /* Now we need to see if this mailbox exists */
++    /* first convert "INBOX" to "user.<userid>" */
++    if (!strncasecmp(lastname, "inbox", 5)) {
++	(*imapd_namespace.mboxname_tointernal)(&imapd_namespace, "INBOX",
++					       imapd_userid, mboxname);
++	strlcat(mboxname, lastname+5, sizeof(mboxname));
++    }
++    else
++	strlcpy(mboxname, lastname, sizeof(mboxname));
++
++    /* Look it up */
++    nonexistent = mboxlist_detail(mboxname, &mbtype,
++				  NULL, NULL, NULL, NULL);
++    if(!nonexistent && (mbtype & MBTYPE_RESERVE))
++	nonexistent = IMAP_MAILBOX_RESERVED;
++
++    if (!name[matchlen]) {
++	lastnamedelayed = 1;
++	if (!maycreate) lastnamenoinferiors = 1;
++	return;
++    }
++
++    c = name[matchlen];
++    if (c) name[matchlen] = '\0';
++    prot_printf(imapd_out, "* %s (", cmd);
++    if (c) {
++	/* Handle namespace prefix as a special case */ 
++	if (!strcmp(name, "user") ||
++	    !strcmp(name, imapd_namespace.prefix[NAMESPACE_SHARED])) {
++	    prot_printf(imapd_out, "\\Noselect");
++	    if (listopts & LIST_EXT)
++		prot_printf(imapd_out, " \\PlaceHolder");
++	}
++	else {
++	    if (nonexistent)
++		prot_printf(imapd_out, "\\NonExistent");
++	    /* LISTEXT uses \PlaceHolder instead of \Noselect */
++	    if (listopts & LIST_EXT)
++		prot_printf(imapd_out, "%s\\PlaceHolder", nonexistent ? " " : "");
++	    else
++		prot_printf(imapd_out, "%s\\Noselect", nonexistent ? " " : "");
++	}
++	if (listopts & LIST_CHILDREN)
++	    prot_printf(imapd_out, " \\HasChildren");
++    }
++    prot_printf(imapd_out, ") \"%c\" ", imapd_namespace.hier_sep);
++
++    (*imapd_namespace.mboxname_toexternal)(&imapd_namespace, name,
++					   imapd_userid, mboxname);
++    printstring(mboxname);
++    prot_printf(imapd_out, "\r\n");
++    if (c) name[matchlen] = c;
++    return;
++}
++
++/*
++ * Issue a LIST untagged response
++ */
++static int listdata(char *name, int matchlen, int maycreate, void *rock)
++{
++    int listopts = *((int *)rock);
++    
++    mstringdata(((listopts & LIST_LSUB) ? "LSUB" : "LIST"),
++	name, matchlen, maycreate, listopts);
++
++    return 0;
++}
++
++/* Reset the given sasl_conn_t to a sane state */
++static int reset_saslconn(sasl_conn_t **conn) 
++{
++    int ret;
++    sasl_security_properties_t *secprops = NULL;
++
++    sasl_dispose(conn);
++    /* do initialization typical of service_main */
++    ret = sasl_server_new("imap", config_servername,
++		          NULL, NULL, NULL,
++			  NULL, 0, conn);
++    if(ret != SASL_OK) return ret;
++
++    if(saslprops.ipremoteport)
++	ret = sasl_setprop(*conn, SASL_IPREMOTEPORT,
++			   saslprops.ipremoteport);
++    if(ret != SASL_OK) return ret;
++    
++    if(saslprops.iplocalport)
++	ret = sasl_setprop(*conn, SASL_IPLOCALPORT,
++			   saslprops.iplocalport);
++    if(ret != SASL_OK) return ret;
++    
++    secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT);
++    ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops);
++    if(ret != SASL_OK) return ret;
++    /* end of service_main initialization excepting SSF */
++
++    /* If we have TLS/SSL info, set it */
++    if(saslprops.ssf) {
++	ret = sasl_setprop(*conn, SASL_SSF_EXTERNAL, &saslprops.ssf);
++    } else {
++	ret = sasl_setprop(*conn, SASL_SSF_EXTERNAL, &extprops_ssf);
++    }
++    if(ret != SASL_OK) return ret;
++
++    if(saslprops.authid) {
++	ret = sasl_setprop(*conn, SASL_AUTH_EXTERNAL, saslprops.authid);
++	if(ret != SASL_OK) return ret;
++    }
++    /* End TLS/SSL Info */
++
++    return SASL_OK;
++}
++
++void cmd_mupdatepush(char *tag, char *name)
++{
++    int r = 0;
++    char mailboxname[MAX_MAILBOX_NAME+1];
++    char *part, *acl;
++    mupdate_handle *mupdate_h = NULL;
++    char buf[MAX_PARTITION_LEN + HOSTNAME_SIZE + 2];
++
++    if (!imapd_userisadmin) {
++	r = IMAP_PERMISSION_DENIED;
++    }
++    if (!config_mupdate_server) {
++	r = IMAP_SERVER_UNAVAILABLE;
++    }
++
++    if (!r) {
++	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
++						   imapd_userid, mailboxname);
++    }
++
++    if (!r) {
++	r = mlookup(tag, name, mailboxname, NULL, NULL, &part, &acl, NULL);
++    }
++    if (r == IMAP_MAILBOX_MOVED) return;
++
++    /* Push mailbox to mupdate server */
++    if (!r) {
++	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
++    }
++
++    if (!r) {
++	snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
++
++	r = mupdate_activate(mupdate_h, mailboxname, buf, acl);
++    }
++
++    if(mupdate_h) {
++	mupdate_disconnect(&mupdate_h);
++    }
++
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    else {
++	prot_printf(imapd_out, "%s OK %s\r\n", tag,
++		    error_message(IMAP_OK_COMPLETED));
++    }
++}
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/pop3d.c
+--- cyrus-imapd-2.2.13/imap/pop3d.c	2006-04-18 20:39:34.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/pop3d.c	2006-04-18 20:39:35.702094974 +0200
+@@ -100,6 +100,10 @@
+ extern int opterr;
+ 
+ 
++#ifdef DRAC_AUTH
++static int drac_enabled;
++extern int dracauth(char *server, unsigned long userip, char **errmsg);
++#endif /* DRAC_AUTH */
+ 
+ #ifdef HAVE_SSL
+ static SSL *tls_conn;
+@@ -408,6 +412,10 @@
+     prot_settimeout(popd_in, timeout*60);
+     prot_setflushonread(popd_in, popd_out);
+ 
++#ifdef DRAC_AUTH
++    drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
++#endif /* DRAC_AUTH */
++
+     if (kflag) kpop();
+ 
+     /* we were connected on pop3s port so we should do 
+@@ -1450,6 +1458,21 @@
+ 	popd_mailbox = &mboxstruct;
+ 	proc_register("pop3d", popd_clienthost, popd_userid,
+ 		      popd_mailbox->name);
++
++#ifdef DRAC_AUTH
++	if (drac_enabled &&
++	    ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
++	    char *err;
++
++	    if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
++			 ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
++		/* disable DRAC */
++		drac_enabled = 0;
++		syslog(LOG_ERR, "dracauth: %s", err);
++		syslog(LOG_ERR, "DRAC notifications disabled");
++	    }
++	}
++#endif /* DRAC_AUTH */
+     }
+ 
+     /* Create telemetry log */
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/pop3d.c.orig
+--- cyrus-imapd-2.2.13/imap/pop3d.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/pop3d.c.orig	2006-04-18 20:39:35.704094779 +0200
+@@ -0,0 +1,1676 @@
++/* pop3d.c -- POP3 server protocol parsing
++ *
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * $Id: pop3d.c,v 1.167 2005/04/11 06:57:35 shadow Exp $
++ */
++#include <config.h>
++
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++#include <stdio.h>
++#include <errno.h>
++#include <string.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <assert.h>
++#include <sys/types.h>
++#include <sys/param.h>
++#include <syslog.h>
++#include <netdb.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <ctype.h>
++#include "prot.h"
++
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
++
++#include "acl.h"
++#include "util.h"
++#include "auth.h"
++#include "iptostring.h"
++#include "global.h"
++#include "tls.h"
++
++#include "exitcodes.h"
++#include "imap_err.h"
++#include "mailbox.h"
++#include "version.h"
++#include "xmalloc.h"
++#include "mboxlist.h"
++#include "idle.h"
++#include "telemetry.h"
++#include "backend.h"
++
++#ifdef HAVE_KRB
++/* kerberos des is purported to conflict with OpenSSL DES */
++#define DES_DEFS
++#include <krb.h>
++
++/* MIT's kpop authentication kludge */
++char klrealm[REALM_SZ];
++AUTH_DAT kdata;
++#endif /* HAVE_KRB */
++static int kflag = 0;
++
++extern int optind;
++extern char *optarg;
++extern int opterr;
++
++
++
++#ifdef HAVE_SSL
++static SSL *tls_conn;
++#endif /* HAVE_SSL */
++
++sasl_conn_t *popd_saslconn; /* the sasl connection context */
++
++char *popd_userid = 0;
++struct mailbox *popd_mailbox = 0;
++struct auth_state *popd_authstate = 0;
++int config_popuseacl;
++struct sockaddr_storage popd_localaddr, popd_remoteaddr;
++int popd_haveaddr = 0;
++char popd_clienthost[NI_MAXHOST*2+1] = "[local]";
++struct protstream *popd_out = NULL;
++struct protstream *popd_in = NULL;
++static int popd_logfd = -1;
++unsigned popd_exists = 0;
++unsigned popd_login_time;
++struct msg {
++    unsigned uid;
++    unsigned size;
++    int deleted;
++} *popd_msg = NULL;
++
++static int pop3s = 0;
++int popd_starttls_done = 0;
++
++static struct mailbox mboxstruct;
++
++static mailbox_decideproc_t expungedeleted;
++
++/* the sasl proxy policy context */
++static struct proxy_context popd_proxyctx = {
++    0, 1, &popd_authstate, NULL, NULL
++};
++
++/* signal to config.c */
++const int config_need_data = CONFIG_NEED_PARTITION_DATA;
++
++/* current namespace */
++static struct namespace popd_namespace;
++
++/* PROXY stuff */
++struct backend *backend = NULL;
++
++static void bitpipe(void);
++/* end PROXY stuff */
++
++static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
++static void cmd_apop(char *response);
++
++static void cmd_auth(char *arg);
++static void cmd_capa(void);
++static void cmd_pass(char *pass);
++static void cmd_user(char *user);
++static void cmd_starttls(int pop3s);
++static void blat(int msg,int lines);
++static int openinbox(void);
++static void cmdloop(void);
++static void kpop(void);
++static int parsenum(char **ptr);
++void usage(void);
++void shut_down(int code) __attribute__ ((noreturn));
++
++
++extern void setproctitle_init(int argc, char **argv, char **envp);
++extern int proc_register(const char *progname, const char *clienthost, 
++			 const char *userid, const char *mailbox);
++extern void proc_cleanup(void);
++
++extern int saslserver(sasl_conn_t *conn, const char *mech,
++		      const char *init_resp, const char *resp_prefix,
++		      const char *continuation, const char *empty_chal,
++		      struct protstream *pin, struct protstream *pout,
++		      int *sasl_result, char **success_data);
++
++/* Enable the resetting of a sasl_conn_t */
++static int reset_saslconn(sasl_conn_t **conn);
++
++static struct 
++{
++    char *ipremoteport;
++    char *iplocalport;
++    sasl_ssf_t ssf;
++    char *authid;
++} saslprops = {NULL,NULL,0,NULL};
++
++static struct sasl_callback mysasl_cb[] = {
++    { SASL_CB_GETOPT, &mysasl_config, NULL },
++    { SASL_CB_PROXY_POLICY, &mysasl_proxy_policy, (void*) &popd_proxyctx },
++    { SASL_CB_CANON_USER, &mysasl_canon_user, NULL },
++    { SASL_CB_LIST_END, NULL, NULL }
++};
++
++static void popd_reset(void)
++{
++    proc_cleanup();
++
++    /* close local mailbox */
++    if (popd_mailbox) {
++	mailbox_close(popd_mailbox);
++	popd_mailbox = 0;
++    }
++
++    /* close backend connection */
++    if (backend) {
++	backend_disconnect(backend, &protocol[PROTOCOL_POP3]);
++	free(backend);
++	backend = NULL;
++    }
++
++    if (popd_in) {
++	prot_NONBLOCK(popd_in);
++	prot_fill(popd_in);
++	
++	prot_free(popd_in);
++    }
++
++    if (popd_out) {
++	prot_flush(popd_out);
++	prot_free(popd_out);
++    }
++    
++    popd_in = popd_out = NULL;
++
++#ifdef HAVE_SSL
++    if (tls_conn) {
++	tls_reset_servertls(&tls_conn);
++	tls_conn = NULL;
++    }
++#endif
++
++    cyrus_reset_stdio(); 
++
++    strcpy(popd_clienthost, "[local]");
++    if (popd_logfd != -1) {
++	close(popd_logfd);
++	popd_logfd = -1;
++    }
++    if (popd_userid != NULL) {
++	free(popd_userid);
++	popd_userid = NULL;
++    }
++    if (popd_authstate) {
++	auth_freestate(popd_authstate);
++	popd_authstate = NULL;
++    }
++    if (popd_saslconn) {
++	sasl_dispose(&popd_saslconn);
++	popd_saslconn = NULL;
++    }
++    popd_starttls_done = 0;
++
++    if(saslprops.iplocalport) {
++       free(saslprops.iplocalport);
++       saslprops.iplocalport = NULL;
++    }
++    if(saslprops.ipremoteport) {
++       free(saslprops.ipremoteport);
++       saslprops.ipremoteport = NULL;
++    }
++    if(saslprops.authid) {
++       free(saslprops.authid);
++       saslprops.authid = NULL;
++    }
++    saslprops.ssf = 0;
++
++    popd_exists = 0;
++}
++
++/*
++ * run once when process is forked;
++ * MUST NOT exit directly; must return with non-zero error code
++ */
++int service_init(int argc __attribute__((unused)),
++		 char **argv __attribute__((unused)),
++		 char **envp __attribute__((unused)))
++{
++    int r;
++    int opt;
++
++    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
++    setproctitle_init(argc, argv, envp);
++
++    /* set signal handlers */
++    signals_set_shutdown(&shut_down);
++    signal(SIGPIPE, SIG_IGN);
++
++    /* load the SASL plugins */
++    global_sasl_init(1, 1, mysasl_cb);
++
++    /* open the mboxlist, we'll need it for real work */
++    mboxlist_init(0);
++    mboxlist_open(NULL);
++
++    /* open the quota db, we'll need it for expunge */
++    quotadb_init(0);
++    quotadb_open(NULL);
++
++    /* setup for sending IMAP IDLE notifications */
++    idle_enabled();
++
++    /* Set namespace */
++    if ((r = mboxname_init_namespace(&popd_namespace, 0)) != 0) {
++	syslog(LOG_ERR, error_message(r));
++	fatal(error_message(r), EC_CONFIG);
++    }
++
++    while ((opt = getopt(argc, argv, "sk")) != EOF) {
++	switch(opt) {
++	case 's': /* pop3s (do starttls right away) */
++	    pop3s = 1;
++	    if (!tls_enabled()) {
++		syslog(LOG_ERR, "pop3s: required OpenSSL options not present");
++		fatal("pop3s: required OpenSSL options not present",
++		      EC_CONFIG);
++	    }
++	    break;
++
++	case 'k':
++	    kflag++;
++	    break;
++	default:
++	    usage();
++	}
++    }
++
++    return 0;
++}
++
++/*
++ * run for each accepted connection
++ */
++int service_main(int argc __attribute__((unused)),
++		 char **argv __attribute__((unused)),
++		 char **envp __attribute__((unused)))
++{
++    socklen_t salen;
++    char hbuf[NI_MAXHOST];
++    char localip[60], remoteip[60];
++    int niflags;
++    int timeout;
++    sasl_security_properties_t *secprops=NULL;
++
++    signals_poll();
++
++    popd_in = prot_new(0, 0);
++    popd_out = prot_new(1, 1);
++
++    /* Find out name of client host */
++    salen = sizeof(popd_remoteaddr);
++    if (getpeername(0, (struct sockaddr *)&popd_remoteaddr, &salen) == 0 &&
++	(popd_remoteaddr.ss_family == AF_INET ||
++	 popd_remoteaddr.ss_family == AF_INET6)) {
++	if (getnameinfo((struct sockaddr *)&popd_remoteaddr, salen,
++			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
++    	    strncpy(popd_clienthost, hbuf, sizeof(hbuf));
++	    strlcat(popd_clienthost, " ", sizeof(popd_clienthost));
++	} else {
++	    popd_clienthost[0] = '\0';
++	}
++	niflags = NI_NUMERICHOST;
++#ifdef NI_WITHSCOPEID
++	if (((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET6)
++	    niflags |= NI_WITHSCOPEID;
++#endif
++	if (getnameinfo((struct sockaddr *)&popd_remoteaddr, salen, hbuf,
++			sizeof(hbuf), NULL, 0, niflags) != 0)
++	    strlcpy(hbuf, "unknown", sizeof(hbuf));
++	strlcat(popd_clienthost, "[", sizeof(popd_clienthost));
++	strlcat(popd_clienthost, hbuf, sizeof(popd_clienthost));
++	strlcat(popd_clienthost, "]", sizeof(popd_clienthost));
++	salen = sizeof(popd_localaddr);
++	if (getsockname(0, (struct sockaddr *)&popd_localaddr, &salen) == 0) {
++	    popd_haveaddr = 1;
++	}
++    }
++
++    /* other params should be filled in */
++    if (sasl_server_new("pop", config_servername, NULL, NULL, NULL,
++			NULL, 0, &popd_saslconn) != SASL_OK)
++	fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); 
++
++    /* will always return something valid */
++    secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT);
++    sasl_setprop(popd_saslconn, SASL_SEC_PROPS, secprops);
++    
++    if(iptostring((struct sockaddr *)&popd_localaddr,
++		  salen, localip, 60) == 0) {
++	sasl_setprop(popd_saslconn, SASL_IPLOCALPORT, localip);
++	saslprops.iplocalport = xstrdup(localip);
++    }
++    
++    if(iptostring((struct sockaddr *)&popd_remoteaddr,
++		  salen, remoteip, 60) == 0) {
++	sasl_setprop(popd_saslconn, SASL_IPREMOTEPORT, remoteip);  
++	saslprops.ipremoteport = xstrdup(remoteip);
++    }
++
++    proc_register("pop3d", popd_clienthost, NULL, NULL);
++
++    /* Set inactivity timer */
++    timeout = config_getint(IMAPOPT_POPTIMEOUT);
++    if (timeout < 10) timeout = 10;
++    prot_settimeout(popd_in, timeout*60);
++    prot_setflushonread(popd_in, popd_out);
++
++    if (kflag) kpop();
++
++    /* we were connected on pop3s port so we should do 
++       TLS negotiation immediatly */
++    if (pop3s == 1) cmd_starttls(1);
++
++    /* Create APOP challenge for banner */
++    *popd_apop_chal = 0;
++    if (config_getswitch(IMAPOPT_ALLOWAPOP) &&
++	(sasl_checkapop(popd_saslconn, NULL, 0, NULL, 0) == SASL_OK) &&
++	!sasl_mkchal(popd_saslconn,
++		     popd_apop_chal, sizeof(popd_apop_chal), 1)) {
++	syslog(LOG_WARNING, "APOP disabled: can't create challenge");
++    }
++
++    prot_printf(popd_out, "+OK %s Cyrus POP3%s %s server ready %s\r\n",
++		config_servername, config_mupdate_server ? " Murder" : "",
++		CYRUS_VERSION, popd_apop_chal);
++    cmdloop();
++
++    /* QUIT executed */
++
++    /* don't bother reusing KPOP connections */
++    if (kflag) shut_down(0);
++
++    /* cleanup */
++    popd_reset();
++
++    return 0;
++}
++
++/* Called by service API to shut down the service */
++void service_abort(int error)
++{
++    shut_down(error);
++}
++
++void usage(void)
++{
++    prot_printf(popd_out, "-ERR usage: pop3d [-C <alt_config>] [-k] [-s]\r\n");
++    prot_flush(popd_out);
++    exit(EC_USAGE);
++}
++
++/*
++ * Cleanly shut down and exit
++ */
++void shut_down(int code)
++{
++    proc_cleanup();
++
++    /* close local mailbox */
++    if (popd_mailbox) {
++	mailbox_close(popd_mailbox);
++    }
++
++    if (popd_msg) {
++	free(popd_msg);
++    }
++
++    /* close backend connection */
++    if (backend) {
++	backend_disconnect(backend, &protocol[PROTOCOL_POP3]);
++	free(backend);
++    }
++
++    mboxlist_close();
++    mboxlist_done();
++
++    quotadb_close();
++    quotadb_done();
++
++    if (popd_in) {
++	prot_NONBLOCK(popd_in);
++	prot_fill(popd_in);
++	prot_free(popd_in);
++    }
++
++    if (popd_out) {
++	prot_flush(popd_out);
++	prot_free(popd_out);
++    }
++
++#ifdef HAVE_SSL
++    tls_shutdown_serverengine();
++#endif
++
++    cyrus_done();
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
++
++    exit(code);
++}
++
++void fatal(const char* s, int code)
++{
++    static int recurse_code = 0;
++
++    if (recurse_code) {
++	/* We were called recursively. Just give up */
++	proc_cleanup();
++	exit(recurse_code);
++    }
++    recurse_code = code;
++    if (popd_out) {
++	prot_printf(popd_out, "-ERR [SYS/PERM] Fatal error: %s\r\n", s);
++	prot_flush(popd_out);
++    }
++    syslog(LOG_ERR, "Fatal error: %s", s);
++    shut_down(code);
++}
++
++#ifdef HAVE_KRB
++/*
++ * MIT's kludge of a kpop protocol
++ * Client does a krb_sendauth() first thing
++ */
++void kpop(void)
++{
++    Key_schedule schedule;
++    KTEXT_ST ticket;
++    char instance[INST_SZ];  
++    char version[9];
++    const char *srvtab;
++    int r;
++    socklen_t len;
++    
++    if (!popd_haveaddr) {
++	fatal("Cannot get client's IP address", EC_OSERR);
++    }
++
++    srvtab = config_getstring(IMAPOPT_SRVTAB);
++
++    sockaddr_unmapped((struct sockaddr *)&popd_remoteaddr, &len);
++    if (popd_remoteaddr.ss_family != AF_INET) {
++	prot_printf(popd_out,
++		    "-ERR [AUTH] Kerberos authentication failure: %s\r\n",
++		    "not an IPv4 connection");
++	shut_down(0);
++    }
++
++    strcpy(instance, "*");
++    r = krb_recvauth(0L, 0, &ticket, "pop", instance,
++		     (struct sockaddr_in *) &popd_remoteaddr,
++		     (struct sockaddr_in *) NULL,
++		     &kdata, (char*) srvtab, schedule, version);
++    
++    if (r) {
++	prot_printf(popd_out, "-ERR [AUTH] Kerberos authentication failure: %s\r\n",
++		    krb_err_txt[r]);
++	syslog(LOG_NOTICE,
++	       "badlogin: %s kpop ? %s%s%s@%s %s",
++	       popd_clienthost, kdata.pname,
++	       kdata.pinst[0] ? "." : "", kdata.pinst,
++	       kdata.prealm, krb_err_txt[r]);
++	shut_down(0);
++    }
++    
++    r = krb_get_lrealm(klrealm,1);
++    if (r) {
++	prot_printf(popd_out, "-ERR [AUTH] Kerberos failure: %s\r\n",
++		    krb_err_txt[r]);
++	syslog(LOG_NOTICE,
++	       "badlogin: %s kpop ? %s%s%s@%s krb_get_lrealm: %s",
++	       popd_clienthost, kdata.pname,
++	       kdata.pinst[0] ? "." : "", kdata.pinst,
++	       kdata.prealm, krb_err_txt[r]);
++	shut_down(0);
++    }
++}
++#else
++void kpop(void)
++{
++    usage();
++}
++#endif
++
++/*
++ * Top-level command loop parsing
++ */
++static void cmdloop(void)
++{
++    char inputbuf[8192];
++    char *p, *arg;
++    unsigned msg = 0;
++
++    for (;;) {
++	signals_poll();
++
++	if (backend) {
++	    /* create a pipe from client to backend */
++	    bitpipe();
++
++	    /* pipe has been closed */
++	    return;
++	}
++
++	/* check for shutdown file */
++	if (shutdown_file(inputbuf, sizeof(inputbuf))) {
++	    for (p = inputbuf; *p == '['; p++); /* can't have [ be first char */
++	    prot_printf(popd_out, "-ERR [SYS/TEMP] %s\r\n", p);
++	    shut_down(0);
++	}
++
++	if (!prot_fgets(inputbuf, sizeof(inputbuf), popd_in)) {
++	    shut_down(0);
++	}
++
++	p = inputbuf + strlen(inputbuf);
++	if (p > inputbuf && p[-1] == '\n') *--p = '\0';
++	if (p > inputbuf && p[-1] == '\r') *--p = '\0';
++
++	/* Parse into keword and argument */
++	for (p = inputbuf; *p && !isspace((int) *p); p++);
++	if (*p) {
++	    *p++ = '\0';
++	    arg = p;
++	    if (strcasecmp(inputbuf, "pass") != 0) {
++		while (*arg && isspace((int) *arg)) {
++		    arg++;
++		}
++	    }
++	    if (!*arg) {
++		if (strcasecmp(inputbuf, "auth") == 0) {
++		    /* HACK for MS Outlook's incorrect use of the old-style
++		     * SASL discovery method.
++		     * Outlook uses "AUTH \r\n" instead if "AUTH\r\n"
++		     */
++		    arg = 0;
++		}
++		else {
++		    prot_printf(popd_out, "-ERR Syntax error\r\n");
++		    continue;
++		}
++	    }
++	}
++	else {
++	    arg = 0;
++	}
++	lcase(inputbuf);
++
++	if (!strcmp(inputbuf, "quit")) {
++	    if (!arg) {
++		if (popd_mailbox) {
++		    if (!mailbox_lock_index(popd_mailbox)) {
++		        int pollpadding =config_getint(IMAPOPT_POPPOLLPADDING);
++			int minpollsec = config_getint(IMAPOPT_POPMINPOLL)*60;
++		        if ((minpollsec > 0) && (pollpadding > 1)) { 
++			    int mintime = popd_login_time - (minpollsec*(pollpadding));
++			    if (popd_mailbox->pop3_last_login < mintime) {
++			        popd_mailbox->pop3_last_login = mintime + minpollsec; 
++			    } else {
++			        popd_mailbox->pop3_last_login += minpollsec;
++			    }
++		        } else { 
++			    popd_mailbox->pop3_last_login = popd_login_time;
++		        }
++			mailbox_write_index_header(popd_mailbox);
++			mailbox_unlock_index(popd_mailbox);
++		    }
++
++		    for (msg = 1; msg <= popd_exists; msg++) {
++			if (popd_msg[msg].deleted) break;
++		    }
++
++		    if (msg <= popd_exists) {
++			(void) mailbox_expunge(popd_mailbox, 1, expungedeleted, 0);
++		    }
++		}
++		prot_printf(popd_out, "+OK\r\n");
++		return;
++	    }
++	    else prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++	}
++	else if (!strcmp(inputbuf, "capa")) {
++	    if (arg) {
++		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++	    } else {
++		cmd_capa();
++	    }
++	}
++	else if (!strcmp(inputbuf, "stls") && tls_enabled()) {
++	    if (arg) {
++		prot_printf(popd_out,
++			    "-ERR STLS doesn't take any arguments\r\n");
++	    } else {
++		cmd_starttls(0);
++	    }
++	}
++	else if (!popd_mailbox) {
++	    if (!strcmp(inputbuf, "user")) {
++		if (!arg) {
++		    prot_printf(popd_out, "-ERR Missing argument\r\n");
++		}
++		else {
++		    cmd_user(arg);
++		}
++	    }
++	    else if (!strcmp(inputbuf, "pass")) {
++		if (!arg) prot_printf(popd_out, "-ERR Missing argument\r\n");
++		else cmd_pass(arg);
++	    }
++	    else if (!strcmp(inputbuf, "apop") && *popd_apop_chal) {
++		if (!arg) prot_printf(popd_out, "-ERR Missing argument\r\n");
++		else cmd_apop(arg);
++	    }
++	    else if (!strcmp(inputbuf, "auth")) {
++		cmd_auth(arg);
++	    }
++	    else {
++		prot_printf(popd_out, "-ERR Unrecognized command\r\n");
++	    }
++	}
++	else if (!strcmp(inputbuf, "stat")) {
++	    unsigned nmsgs = 0, totsize = 0;
++	    if (arg) {
++		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++	    }
++	    else {
++		for (msg = 1; msg <= popd_exists; msg++) {
++		    if (!popd_msg[msg].deleted) {
++			nmsgs++;
++			totsize += popd_msg[msg].size;
++		    }
++		}
++		prot_printf(popd_out, "+OK %u %u\r\n", nmsgs, totsize);
++	    }
++	}
++	else if (!strcmp(inputbuf, "list")) {
++	    if (arg) {
++		msg = parsenum(&arg);
++		if (arg) {
++		    prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++		}
++		else if (msg < 1 || msg > popd_exists ||
++			 popd_msg[msg].deleted) {
++		    prot_printf(popd_out, "-ERR No such message\r\n");
++		}
++		else {
++		    prot_printf(popd_out, "+OK %u %u\r\n", msg, popd_msg[msg].size);
++		}
++	    }
++	    else {
++		prot_printf(popd_out, "+OK scan listing follows\r\n");
++		for (msg = 1; msg <= popd_exists; msg++) {
++		    if (!popd_msg[msg].deleted) {
++			prot_printf(popd_out, "%u %u\r\n", msg, popd_msg[msg].size);
++		    }
++		}
++		prot_printf(popd_out, ".\r\n");
++	    }
++	}
++	else if (!strcmp(inputbuf, "retr")) {
++	    if (!arg) prot_printf(popd_out, "-ERR Missing argument\r\n");
++	    else {
++		msg = parsenum(&arg);
++		if (arg) {
++		    prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++		}
++		else if (msg < 1 || msg > popd_exists ||
++			 popd_msg[msg].deleted) {
++		    prot_printf(popd_out, "-ERR No such message\r\n");
++		}
++		else {
++		    blat(msg, -1);
++		}
++	    }
++	}
++	else if (!strcmp(inputbuf, "dele")) {
++	    if (!arg) prot_printf(popd_out, "-ERR Missing argument\r\n");
++	    else if (config_popuseacl && !(mboxstruct.myrights & ACL_DELETE)) {
++		prot_printf(popd_out, "-ERR [SYS/PERM] %s\r\n",
++			    error_message(IMAP_PERMISSION_DENIED));
++	    }
++	    else {
++		msg = parsenum(&arg);
++		if (arg) {
++		    prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++		}
++		else if (msg < 1 || msg > popd_exists ||
++			 popd_msg[msg].deleted) {
++		    prot_printf(popd_out, "-ERR No such message\r\n");
++		}
++		else {
++		    popd_msg[msg].deleted = 1;
++		    prot_printf(popd_out, "+OK message deleted\r\n");
++		}
++	    }
++	}
++	else if (!strcmp(inputbuf, "noop")) {
++	    if (arg) {
++		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++	    }
++	    else {
++		prot_printf(popd_out, "+OK\r\n");
++	    }
++	}
++	else if (!strcmp(inputbuf, "rset")) {
++	    if (arg) {
++		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++	    }
++	    else {
++		for (msg = 1; msg <= popd_exists; msg++) {
++		    popd_msg[msg].deleted = 0;
++		}
++		prot_printf(popd_out, "+OK\r\n");
++	    }
++	}
++	else if (!strcmp(inputbuf, "top")) {
++	    int lines;
++
++	    if (arg) msg = parsenum(&arg);
++	    if (!arg) prot_printf(popd_out, "-ERR Missing argument\r\n");
++	    else {
++		lines = parsenum(&arg);
++		if (arg) {
++		    prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++		}
++		else if (msg < 1 || msg > popd_exists ||
++			 popd_msg[msg].deleted) {
++		    prot_printf(popd_out, "-ERR No such message\r\n");
++		}
++		else if (lines < 0) {
++		    prot_printf(popd_out, "-ERR Invalid number of lines\r\n");
++		}
++		else {
++		    blat(msg, lines);
++		}
++	    }
++	}
++	else if (!strcmp(inputbuf, "uidl")) {
++	    if (arg) {
++		msg = parsenum(&arg);
++		if (arg) {
++		    prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
++		}
++		else if (msg < 1 || msg > popd_exists ||
++			 popd_msg[msg].deleted) {
++		    prot_printf(popd_out, "-ERR No such message\r\n");
++		}
++		else if (mboxstruct.pop3_new_uidl) {
++			    prot_printf(popd_out, "+OK %u %lu.%u\r\n", msg, 
++					mboxstruct.uidvalidity,
++					popd_msg[msg].uid);
++		}
++		else {
++		    /* old uidl format */
++		    prot_printf(popd_out, "+OK %u %u\r\n", 
++				msg, popd_msg[msg].uid);
++		}
++	    }
++	    else {
++		prot_printf(popd_out, "+OK unique-id listing follows\r\n");
++		for (msg = 1; msg <= popd_exists; msg++) {
++		    if (!popd_msg[msg].deleted) {
++			if (mboxstruct.pop3_new_uidl) {
++			    prot_printf(popd_out, "%u %lu.%u\r\n", msg, 
++					mboxstruct.uidvalidity,
++					popd_msg[msg].uid);
++			} else {
++			    prot_printf(popd_out, "%u %u\r\n", msg, 
++					popd_msg[msg].uid);
++			}
++		    }
++		}
++		prot_printf(popd_out, ".\r\n");
++	    }
++	}
++	else {
++	    prot_printf(popd_out, "-ERR Unrecognized command\r\n");
++	}
++    }		
++}
++
++#ifdef HAVE_SSL
++static void cmd_starttls(int pop3s)
++{
++    int result;
++    int *layerp;
++    sasl_ssf_t ssf;
++    char *auth_id;
++
++    /* SASL and openssl have different ideas about whether ssf is signed */
++    layerp = (int *) &ssf;
++
++    if (popd_starttls_done == 1)
++    {
++	prot_printf(popd_out, "-ERR %s\r\n", 
++		    "Already successfully executed STLS");
++	return;
++    }
++
++    result=tls_init_serverengine("pop3",
++				 5,        /* depth to verify */
++				 !pop3s,   /* can client auth? */
++				 !pop3s);  /* TLS only? */
++
++    if (result == -1) {
++
++	syslog(LOG_ERR, "[pop3d] error initializing TLS");
++
++	if (pop3s == 0)
++	    prot_printf(popd_out, "-ERR [SYS/PERM] %s\r\n", "Error initializing TLS");
++	else
++	    fatal("tls_init() failed",EC_TEMPFAIL);
++
++	return;
++    }
++
++    if (pop3s == 0)
++    {
++	prot_printf(popd_out, "+OK %s\r\n", "Begin TLS negotiation now");
++	/* must flush our buffers before starting tls */
++	prot_flush(popd_out);
++    }
++  
++    result=tls_start_servertls(0, /* read */
++			       1, /* write */
++			       layerp,
++			       &auth_id,
++			       &tls_conn);
++
++    /* if error */
++    if (result==-1) {
++	if (pop3s == 0) {
++	    prot_printf(popd_out, "-ERR [SYS/PERM] Starttls failed\r\n");
++	    syslog(LOG_NOTICE, "[pop3d] STARTTLS failed: %s", popd_clienthost);
++	} else {
++	    syslog(LOG_NOTICE, "pop3s failed: %s", popd_clienthost);
++	    fatal("tls_start_servertls() failed", EC_TEMPFAIL);
++	}
++	return;
++    }
++
++    /* tell SASL about the negotiated layer */
++    result = sasl_setprop(popd_saslconn, SASL_SSF_EXTERNAL, &ssf);
++    if (result != SASL_OK) {
++	fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
++    }
++    saslprops.ssf = ssf;
++
++    result = sasl_setprop(popd_saslconn, SASL_AUTH_EXTERNAL, auth_id);
++    if (result != SASL_OK) {
++        fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
++    }
++    if(saslprops.authid) {
++	free(saslprops.authid);
++	saslprops.authid = NULL;
++    }
++    if(auth_id)
++	saslprops.authid = xstrdup(auth_id);
++
++    /* tell the prot layer about our new layers */
++    prot_settls(popd_in, tls_conn);
++    prot_settls(popd_out, tls_conn);
++
++    popd_starttls_done = 1;
++}
++#else
++static void cmd_starttls(int pop3s __attribute__((unused)))
++{
++    fatal("cmd_starttls() called, but no OpenSSL", EC_SOFTWARE);
++}
++#endif /* HAVE_SSL */
++
++static void cmd_apop(char *response)
++{
++    int sasl_result;
++    char *canon_user;
++
++    assert(response != NULL);
++
++    if (popd_userid) {
++	prot_printf(popd_out, "-ERR [AUTH] Must give PASS command\r\n");
++	return;
++    }
++
++    sasl_result = sasl_checkapop(popd_saslconn,
++				 popd_apop_chal,
++				 strlen(popd_apop_chal),
++				 response,
++				 strlen(response));
++    
++    /* failed authentication */
++    if (sasl_result != SASL_OK)
++    {
++	sleep(3);      
++		
++	prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
++		    sasl_errstring(sasl_result, NULL, NULL));
++
++	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
++	       popd_clienthost, popd_apop_chal,
++	       sasl_errdetail(popd_saslconn));
++	
++	return;
++    }
++
++    /* successful authentication */
++
++    /*
++     * get the userid from SASL --- already canonicalized from
++     * mysasl_proxy_policy()
++     */
++    sasl_result = sasl_getprop(popd_saslconn, SASL_USERNAME,
++			       (const void **) &canon_user);
++    popd_userid = xstrdup(canon_user);
++    if (sasl_result != SASL_OK) {
++	prot_printf(popd_out, 
++		    "-ERR [AUTH] weird SASL error %d getting SASL_USERNAME\r\n", 
++		    sasl_result);
++	return;
++    }
++    
++    syslog(LOG_NOTICE, "login: %s %s APOP%s %s", popd_clienthost,
++	   popd_userid, popd_starttls_done ? "+TLS" : "", "User logged in");
++
++    popd_authstate = auth_newstate(popd_userid);
++
++    openinbox();
++}
++
++void cmd_user(char *user)
++{
++    char *p, *dot, *domain;
++
++    /* possibly disallow USER */
++    if (!(kflag || popd_starttls_done ||
++	  config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
++	prot_printf(popd_out,
++		    "-ERR [AUTH] USER command only available under a layer\r\n");
++	return;
++    }
++
++    if (popd_userid) {
++	prot_printf(popd_out, "-ERR [AUTH] Must give PASS command\r\n");
++	return;
++    }
++
++    if (!(p = canonify_userid(user, NULL, NULL)) ||
++	     /* '.' isn't allowed if '.' is the hierarchy separator */
++	     (popd_namespace.hier_sep == '.' && (dot = strchr(p, '.')) &&
++	      !(config_virtdomains &&  /* allow '.' in dom.ain */
++		(domain = strchr(p, '@')) && (dot > domain))) ||
++	     strlen(p) + 6 > MAX_MAILBOX_PATH) {
++	prot_printf(popd_out, "-ERR [AUTH] Invalid user\r\n");
++	syslog(LOG_NOTICE,
++	       "badlogin: %s plaintext %s invalid user",
++	       popd_clienthost, beautify_string(user));
++    }
++    else {
++	popd_userid = xstrdup(p);
++	prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
++    }
++}
++
++void cmd_pass(char *pass)
++{
++    int plaintextloginpause;
++
++    if (!popd_userid) {
++	prot_printf(popd_out, "-ERR [AUTH] Must give USER command\r\n");
++	return;
++    }
++
++#ifdef HAVE_KRB
++    if (kflag) {
++	if (strcmp(popd_userid, kdata.pname) != 0 ||
++	    kdata.pinst[0] ||
++	    strcmp(klrealm, kdata.prealm) != 0) {
++	    prot_printf(popd_out, "-ERR [AUTH] Invalid login\r\n");
++	    syslog(LOG_NOTICE,
++		   "badlogin: %s kpop %s %s%s%s@%s access denied",
++		   popd_clienthost, popd_userid,
++		   kdata.pname, kdata.pinst[0] ? "." : "",
++		   kdata.pinst, kdata.prealm);
++	    return;
++	}
++
++	syslog(LOG_NOTICE, "login: %s %s kpop", popd_clienthost, popd_userid);
++
++	openinbox();
++	return;
++    }
++#endif
++
++    if (!strcmp(popd_userid, "anonymous")) {
++	if (config_getswitch(IMAPOPT_ALLOWANONYMOUSLOGIN)) {
++	    pass = beautify_string(pass);
++	    if (strlen(pass) > 500) pass[500] = '\0';
++	    syslog(LOG_NOTICE, "login: %s anonymous %s",
++		   popd_clienthost, pass);
++	}
++	else {
++	    syslog(LOG_NOTICE, "badlogin: %s anonymous login refused",
++		   popd_clienthost);
++	    prot_printf(popd_out, "-ERR [AUTH] Invalid login\r\n");
++	    return;
++	}
++    }
++    else if (sasl_checkpass(popd_saslconn,
++			    popd_userid,
++			    strlen(popd_userid),
++			    pass,
++			    strlen(pass))!=SASL_OK) { 
++	syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
++	       popd_clienthost, popd_userid, sasl_errdetail(popd_saslconn));
++	sleep(3);
++	prot_printf(popd_out, "-ERR [AUTH] Invalid login\r\n");
++	free(popd_userid);
++	popd_userid = 0;
++
++	return;
++    }
++    else {
++	syslog(LOG_NOTICE, "login: %s %s plaintext%s %s", popd_clienthost,
++	       popd_userid, popd_starttls_done ? "+TLS" : "", 
++	       "User logged in");
++
++	if ((plaintextloginpause = config_getint(IMAPOPT_PLAINTEXTLOGINPAUSE))
++	     != 0) {
++	    sleep(plaintextloginpause);
++	}
++    }
++
++    popd_authstate = auth_newstate(popd_userid);
++
++    openinbox();
++}
++
++/* Handle the POP3 Extension extension.
++ */
++void cmd_capa()
++{
++    int minpoll = config_getint(IMAPOPT_POPMINPOLL) * 60;
++    int expire = config_getint(IMAPOPT_POPEXPIRETIME);
++    unsigned mechcount;
++    const char *mechlist;
++
++    prot_printf(popd_out, "+OK List of capabilities follows\r\n");
++
++    /* SASL special case: print SASL, then a list of supported capabilities */
++    if (!popd_mailbox && !backend &&
++	sasl_listmech(popd_saslconn,
++		      NULL, /* should be id string */
++		      "SASL ", " ", "\r\n",
++		      &mechlist,
++		      NULL, &mechcount) == SASL_OK && mechcount > 0) {
++	prot_write(popd_out, mechlist, strlen(mechlist));
++    }
++
++    if (tls_enabled() && !popd_starttls_done && !popd_mailbox && !backend) {
++	prot_printf(popd_out, "STLS\r\n");
++    }
++    if (expire < 0) {
++	prot_printf(popd_out, "EXPIRE NEVER\r\n");
++    } else {
++	prot_printf(popd_out, "EXPIRE %d\r\n", expire);
++    }
++
++    prot_printf(popd_out, "LOGIN-DELAY %d\r\n", minpoll);
++    prot_printf(popd_out, "TOP\r\n");
++    prot_printf(popd_out, "UIDL\r\n");
++    prot_printf(popd_out, "PIPELINING\r\n");
++    prot_printf(popd_out, "RESP-CODES\r\n");
++    prot_printf(popd_out, "AUTH-RESP-CODE\r\n");
++
++    if (!popd_mailbox && !backend &&
++	(kflag || popd_starttls_done
++	 || config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
++	prot_printf(popd_out, "USER\r\n");
++    }
++    
++    prot_printf(popd_out,
++		"IMPLEMENTATION Cyrus POP3%s server %s\r\n",
++		config_mupdate_server ? " Murder" : "", CYRUS_VERSION);
++
++    prot_printf(popd_out, ".\r\n");
++    prot_flush(popd_out);
++}
++
++
++void cmd_auth(char *arg)
++{
++    int r, sasl_result;
++    char *authtype;
++    char *canon_user;
++
++    /* if client didn't specify an argument we give them the list
++     *
++     * XXX This method of mechanism discovery is an undocumented feature
++     * that appeared in draft-myers-sasl-pop3 and is still used by
++     * some clients.
++     */
++    if (!arg) {
++	const char *sasllist;
++	unsigned int mechnum;
++
++	prot_printf(popd_out, "+OK List of supported mechanisms follows\r\n");
++      
++	/* CRLF separated, dot terminated */
++	if (sasl_listmech(popd_saslconn, NULL,
++			  "", "\r\n", "\r\n",
++			  &sasllist,
++			  NULL, &mechnum) == SASL_OK) {
++	    if (mechnum>0) {
++		prot_printf(popd_out,"%s",sasllist);
++	    }
++	}
++      
++	prot_printf(popd_out, ".\r\n");
++      	return;
++    }
++
++    authtype = arg;
++
++    /* according to RFC 2449, since we advertise the "SASL" capability, we
++     * must accept an optional second argument as an initial client
++     * response (base64 encoded!).
++     */ 
++    while (*arg && !isspace((int) *arg)) {
++	arg++;
++    }
++    if (isspace((int) *arg)) {
++	/* null terminate authtype, get argument */
++	*arg++ = '\0';
++    } else {
++	/* no optional client response */
++	arg = NULL;
++    }
++
++    r = saslserver(popd_saslconn, authtype, arg, "", "+ ", "",
++		   popd_in, popd_out, &sasl_result, NULL);
++
++    if (r) {
++	const char *errorstring = NULL;
++
++	switch (r) {
++	case IMAP_SASL_CANCEL:
++	    prot_printf(popd_out,
++			"-ERR [AUTH] Client canceled authentication\r\n");
++	    break;
++	case IMAP_SASL_PROTERR:
++	    errorstring = prot_error(popd_in);
++
++	    prot_printf(popd_out,
++			"-ERR [AUTH] Error reading client response: %s\r\n",
++			errorstring ? errorstring : "");
++	    break;
++	default:
++	    /* failed authentication */
++	    sleep(3);
++		
++	    prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
++			sasl_errstring(sasl_result, NULL, NULL));
++
++	    if (authtype) {
++		syslog(LOG_NOTICE, "badlogin: %s %s %s",
++		       popd_clienthost, authtype,
++		       sasl_errstring(sasl_result, NULL, NULL));
++	    } else {
++		syslog(LOG_NOTICE, "badlogin: %s %s",
++		       popd_clienthost, authtype);
++	    }
++	}
++	
++	reset_saslconn(&popd_saslconn);
++	return;
++    }
++
++    /* successful authentication */
++
++    /* get the userid from SASL --- already canonicalized from
++     * mysasl_proxy_policy()
++     */
++    sasl_result = sasl_getprop(popd_saslconn, SASL_USERNAME,
++			       (const void **) &canon_user);
++    popd_userid = xstrdup(canon_user);
++    if (sasl_result != SASL_OK) {
++	prot_printf(popd_out, 
++		    "-ERR [AUTH] weird SASL error %d getting SASL_USERNAME\r\n", 
++		    sasl_result);
++	return;
++    }
++    
++    syslog(LOG_NOTICE, "login: %s %s %s%s %s", popd_clienthost, popd_userid,
++	   authtype, popd_starttls_done ? "+TLS" : "", "User logged in");
++
++    if (!openinbox()) {
++	prot_setsasl(popd_in,  popd_saslconn);
++	prot_setsasl(popd_out, popd_saslconn);
++    }
++    else {
++	reset_saslconn(&popd_saslconn);
++    }
++}
++
++/*
++ * Complete the login process by opening and locking the user's inbox
++ */
++int openinbox(void)
++{
++    char userid[MAX_MAILBOX_NAME+1], inboxname[MAX_MAILBOX_PATH+1];
++    int type, myrights = 0;
++    char *server = NULL, *acl;
++    int r, log_level = LOG_ERR;
++    const char *statusline = NULL;
++
++    /* Translate any separators in userid
++       (use a copy since we need the original userid for AUTH to backend) */
++    strlcpy(userid, popd_userid, sizeof(userid));
++    mboxname_hiersep_tointernal(&popd_namespace, userid,
++				config_virtdomains ?
++				strcspn(userid, "@") : 0);
++
++    r = (*popd_namespace.mboxname_tointernal)(&popd_namespace, "INBOX",
++					      userid, inboxname);
++
++    if (!r) r = mboxlist_detail(inboxname, &type, NULL, &server, &acl, NULL);
++    if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
++	(!acl ||
++	 !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
++	r = (myrights & ACL_LOOKUP) ?
++	    IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++	log_level = LOG_INFO;
++    }
++    if (r) {
++	sleep(3);
++	syslog(log_level, "Unable to locate maildrop for %s: %s",
++	       popd_userid, error_message(r));
++	prot_printf(popd_out,
++		    "-ERR [SYS/PERM] Unable to locate maildrop: %s\r\n",
++		    error_message(r));
++	goto fail;
++    }
++
++    if (type & MBTYPE_REMOTE) {
++	/* remote mailbox */
++
++	/* xxx hide the fact that we are storing partitions */
++	if (server) {
++	    char *c;
++	    c = strchr(server, '!');
++	    if(c) *c = '\0';
++	}
++
++	backend = backend_connect(NULL, server, &protocol[PROTOCOL_POP3],
++				  popd_userid, &statusline);
++
++	if (!backend) {
++	    syslog(LOG_ERR, "couldn't authenticate to backend server");
++	    prot_printf(popd_out, "-ERR%s",
++			statusline ? statusline :
++			" Authentication to backend server failed\r\n");
++	    prot_flush(popd_out);
++	    
++	    goto fail;
++	}
++    }
++    else {
++	/* local mailbox */
++	int msg;
++	struct index_record record;
++	int minpoll;
++	int doclose = 0;
++
++	popd_login_time = time(0);
++
++	r = mailbox_open_header(inboxname, popd_authstate, &mboxstruct);
++	if (!r) {
++	    doclose = 1;
++	    if (config_popuseacl && !(mboxstruct.myrights & ACL_READ)) {
++		r = (mboxstruct.myrights & ACL_LOOKUP) ?
++		    IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
++		log_level = LOG_INFO;
++	    }
++	}
++	if (r) {
++	    sleep(3);
++	    syslog(log_level, "Unable to open maildrop for %s: %s",
++		   popd_userid, error_message(r));
++	    prot_printf(popd_out,
++			"-ERR [SYS/PERM] Unable to open maildrop: %s\r\n",
++			error_message(r));
++	    if (doclose) mailbox_close(&mboxstruct);
++	    goto fail;
++	}
++
++	r = mailbox_open_index(&mboxstruct);
++	if (!r) r = mailbox_lock_pop(&mboxstruct);
++	if (r) {
++	    mailbox_close(&mboxstruct);
++	    syslog(LOG_ERR, "Unable to lock maildrop for %s: %s",
++		   popd_userid, error_message(r));
++	    prot_printf(popd_out,
++			"-ERR [IN-USE] Unable to lock maildrop: %s\r\n",
++			error_message(r));
++	    goto fail;
++	}
++
++	if ((minpoll = config_getint(IMAPOPT_POPMINPOLL)) &&
++	    mboxstruct.pop3_last_login + 60*minpoll > popd_login_time) {
++	    prot_printf(popd_out,
++			"-ERR [LOGIN-DELAY] Logins must be at least %d minute%s apart\r\n",
++			minpoll, minpoll > 1 ? "s" : "");
++	    if (!mailbox_lock_index(&mboxstruct)) {
++		mboxstruct.pop3_last_login = popd_login_time;
++		mailbox_write_index_header(&mboxstruct);
++	    }
++	    mailbox_close(&mboxstruct);
++	    goto fail;
++	}
++
++	if (chdir(mboxstruct.path)) {
++	    syslog(LOG_ERR, "IOERROR: changing directory to %s: %m",
++		   mboxstruct.path);
++	    r = IMAP_IOERROR;
++	}
++	if (!r) {
++	    popd_exists = mboxstruct.exists;
++	    popd_msg = (struct msg *) xrealloc(popd_msg, (popd_exists+1) *
++					       sizeof(struct msg));
++	    for (msg = 1; msg <= popd_exists; msg++) {
++		if ((r = mailbox_read_index_record(&mboxstruct, msg, &record))!=0)
++		    break;
++		popd_msg[msg].uid = record.uid;
++		popd_msg[msg].size = record.size;
++		popd_msg[msg].deleted = 0;
++	    }
++	}
++	if (r) {
++	    mailbox_close(&mboxstruct);
++	    popd_exists = 0;
++	    syslog(LOG_ERR, "Unable to read maildrop for %s", popd_userid);
++	    prot_printf(popd_out,
++			"-ERR [SYS/PERM] Unable to read maildrop\r\n");
++	    goto fail;
++	}
++	popd_mailbox = &mboxstruct;
++	proc_register("pop3d", popd_clienthost, popd_userid,
++		      popd_mailbox->name);
++    }
++
++    /* Create telemetry log */
++    popd_logfd = telemetry_log(popd_userid, popd_in, popd_out, 0);
++
++    prot_printf(popd_out, "+OK%s",
++		statusline ? statusline : " Mailbox locked and ready\r\n");
++    prot_flush(popd_out);
++    return 0;
++
++  fail:
++    free(popd_userid);
++    popd_userid = 0;
++    auth_freestate(popd_authstate);
++    popd_authstate = NULL;
++    return 1;
++}
++
++static void blat(int msg,int lines)
++{
++    FILE *msgfile;
++    char buf[4096];
++    char fnamebuf[MAILBOX_FNAME_LEN];
++    int thisline = -2;
++
++    mailbox_message_get_fname(popd_mailbox, popd_msg[msg].uid, fnamebuf,
++			      sizeof(fnamebuf));
++    msgfile = fopen(fnamebuf, "r");
++    if (!msgfile) {
++	prot_printf(popd_out, "-ERR [SYS/PERM] Could not read message file\r\n");
++	return;
++    }
++    prot_printf(popd_out, "+OK Message follows\r\n");
++    while (lines != thisline) {
++	if (!fgets(buf, sizeof(buf), msgfile)) break;
++
++	if (thisline < 0) {
++	    if (buf[0] == '\r' && buf[1] == '\n') thisline = 0;
++	}
++	else thisline++;
++
++	if (buf[0] == '.') prot_putc('.', popd_out);
++	do {
++	    prot_printf(popd_out, "%s", buf);
++	}
++	while (buf[strlen(buf)-1] != '\n' && fgets(buf, sizeof(buf), msgfile));
++    }
++    fclose(msgfile);
++
++    /* Protect against messages not ending in CRLF */
++    if (buf[strlen(buf)-1] != '\n') prot_printf(popd_out, "\r\n");
++
++    prot_printf(popd_out, ".\r\n");
++}
++
++static int parsenum(char **ptr)
++{
++    char *p = *ptr;
++    int result = 0;
++
++    if (!isdigit((int) *p)) {
++	*ptr = 0;
++	return -1;
++    }
++    while (*p && isdigit((int) *p)) {
++	result = result * 10 + *p++ - '0';
++        if (result < 0) {
++            /* xxx overflow */
++        }
++    }
++
++    if (*p) {
++	while (*p && isspace((int) *p)) p++;
++	*ptr = p;
++    }
++    else *ptr = 0;
++    return result;
++}
++
++static int expungedeleted(struct mailbox *mailbox __attribute__((unused)),
++			  void *rock __attribute__((unused)), char *index)
++{
++    int msg;
++    int uid = ntohl(*((bit32 *)(index+OFFSET_UID)));
++
++    for (msg = 1; msg <= popd_exists; msg++) {
++	if (popd_msg[msg].uid == uid) {
++	    return popd_msg[msg].deleted;
++	}
++    }
++    return 0;
++}
++
++/* Reset the given sasl_conn_t to a sane state */
++static int reset_saslconn(sasl_conn_t **conn) 
++{
++    int ret;
++    sasl_security_properties_t *secprops = NULL;
++
++    sasl_dispose(conn);
++    /* do initialization typical of service_main */
++    ret = sasl_server_new("pop", config_servername,
++                         NULL, NULL, NULL,
++                         NULL, 0, conn);
++    if(ret != SASL_OK) return ret;
++
++    if(saslprops.ipremoteport)
++       ret = sasl_setprop(*conn, SASL_IPREMOTEPORT,
++                          saslprops.ipremoteport);
++    if(ret != SASL_OK) return ret;
++    
++    if(saslprops.iplocalport)
++       ret = sasl_setprop(*conn, SASL_IPLOCALPORT,
++                          saslprops.iplocalport);
++    if(ret != SASL_OK) return ret;
++    secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT);
++    ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops);
++    if(ret != SASL_OK) return ret;
++    /* end of service_main initialization excepting SSF */
++
++    /* If we have TLS/SSL info, set it */
++    if(saslprops.ssf) {
++       ret = sasl_setprop(*conn, SASL_SSF_EXTERNAL, &saslprops.ssf);
++    }
++
++    if(ret != SASL_OK) return ret;
++
++    if(saslprops.authid) {
++       ret = sasl_setprop(*conn, SASL_AUTH_EXTERNAL, saslprops.authid);
++       if(ret != SASL_OK) return ret;
++    }
++    /* End TLS/SSL Info */
++
++    return SASL_OK;
++}
++
++/* we've authenticated the client, we've connected to the backend.
++   now it's all up to them */
++static void bitpipe(void)
++{
++    struct protgroup *protin = protgroup_new(2);
++    struct protgroup *protout = NULL;
++    struct timeval timeout;
++    int n, shutdown = 0;
++    char buf[4096];
++
++    /* Reset protin to all zeros (to preserve memory allocation) */
++    protgroup_reset(protin);
++    protgroup_insert(protin, popd_in);
++    protgroup_insert(protin, backend->in);
++
++    for (;;) {
++	/* check for shutdown file */
++	if (shutdown_file(buf, sizeof(buf))) {
++	    shutdown = 1;
++	    goto done;
++	}
++
++	/* Clear protout if needed */
++	protgroup_free(protout);
++	protout = NULL;
++
++	timeout.tv_sec = 60;
++	timeout.tv_usec = 0;
++
++	n = prot_select(protin, PROT_NO_FD, &protout, NULL, &timeout);
++	if (n == -1) {
++	    syslog(LOG_ERR, "prot_select() failed in bitpipe(): %m");
++	    fatal("prot_select() failed in bitpipe()", EC_TEMPFAIL);
++	}
++	if (n && protout) {
++	    struct protstream *ptmp;
++
++	    for (; n; n--) {
++		ptmp = protgroup_getelement(protout, n-1);
++
++		if (ptmp == popd_in) {
++		    do {
++			int c = prot_read(popd_in, buf, sizeof(buf));
++			if (c == 0 || c < 0) goto done;
++			prot_write(backend->out, buf, c);
++		    } while (popd_in->cnt > 0);
++		    prot_flush(backend->out);
++		}
++		else if (ptmp == backend->in) {
++		    do {
++			int c = prot_read(backend->in, buf, sizeof(buf));
++			if (c == 0 || c < 0) goto done;
++			prot_write(popd_out, buf, c);
++		    } while (backend->in->cnt > 0);
++		    prot_flush(popd_out);
++		}
++		else {
++		    /* XXX shouldn't get here !!! */
++		    fatal("unknown protstream returned by prot_select in bitpipe()",
++			  EC_SOFTWARE);
++		}
++	    }
++	}
++    }
++
++
++ done:
++    /* ok, we're done. */
++    protgroup_free(protin);
++    protgroup_free(protout);
++
++    if (shutdown) {
++	char *p;
++	for (p = buf; *p == '['; p++); /* can't have [ be first char */
++	prot_printf(popd_out, "-ERR [SYS/TEMP] %s\r\n", p);
++	shut_down(0);
++    }
++
++    return;
++}
++
++
++void printstring(const char *s __attribute__((unused)))
++{
++    /* needed to link against annotate.o */
++    fatal("printstring() executed, but its not used for POP3!",
++	  EC_SOFTWARE);
++}
+diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/version.c
+--- cyrus-imapd-2.2.13/imap/version.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/version.c	2006-04-18 20:39:35.704094779 +0200
+@@ -151,6 +151,10 @@
+     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ 	     "; %s", SIEVE_VERSION);
+ #endif
++#ifdef DRAC_AUTH
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; DRAC");
++#endif
+ #ifdef HAVE_LIBWRAP
+     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ 	     "; TCP Wrappers");
+diff -urNad cyrus-imapd-2.2.13/imap/version.c.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/version.c.orig
+--- cyrus-imapd-2.2.13/imap/version.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/imap/version.c.orig	2006-04-18 20:39:35.705094682 +0200
+@@ -0,0 +1,181 @@
++/* version.c: versioning functions
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * $Id: version.c,v 1.19 2005/02/16 20:37:58 shadow Exp $
++ */
++
++#include <config.h>
++
++#include <sasl/sasl.h>
++#include <sys/utsname.h>
++#ifdef HAVE_BDB
++#include <db.h>
++#endif
++#ifdef HAVE_KRB
++#include <krb.h>
++#endif
++#ifdef HAVE_UCDSNMP
++#include <ucd-snmp/version.h>
++#endif
++
++#include <string.h>
++#include "version.h"
++#include "xversion.h"
++#include "prot.h"
++#include "cyrusdb.h"
++#include "map.h"
++#include "lock.h"
++#include "nonblock.h"
++#include "idle.h"
++
++#ifdef USE_SIEVE
++#include "sieve_interface.h"
++#endif
++
++static char id_resp_command[MAXIDVALUELEN];
++static char id_resp_arguments[MAXIDVALUELEN] = "";
++
++/*
++ * Grab the command line args for the ID response.
++ */
++void id_getcmdline(int argc, char **argv)
++{
++    snprintf(id_resp_command, MAXIDVALUELEN, *argv);
++    while (--argc > 0) {
++	snprintf(id_resp_arguments + strlen(id_resp_arguments),
++		 MAXIDVALUELEN - strlen(id_resp_arguments),
++		 "%s%s", *++argv, (argc > 1) ? " " : "");
++    }
++}
++
++/*
++ * Output the ID response.
++ * We do NOT close the parameter list so other stuff can be added later.
++ */
++void id_response(struct protstream *pout)
++{
++    struct utsname os;
++    const char *sasl_imp;
++    int sasl_ver;
++    char env_buf[MAXIDVALUELEN+1];
++
++    prot_printf(pout, "* ID ("
++		"\"name\" \"Cyrus IMAPD\""
++		" \"version\" \"%s %s\""
++		" \"vendor\" \"Project Cyrus\""
++		" \"support-url\" \"http://asg.web.cmu.edu/cyrus\"",
++		CYRUS_VERSION, CYRUS_CVSDATE);
++
++    /* add the os info */
++    if (uname(&os) != -1)
++	prot_printf(pout,
++		    " \"os\" \"%s\""
++		    " \"os-version\" \"%s\"",
++		    os.sysname, os.release);
++
++#ifdef ID_SAVE_CMDLINE
++    /* add the command line info */
++    prot_printf(pout, " \"command\" \"%s\"", id_resp_command);
++    if (strlen(id_resp_arguments)) {
++	prot_printf(pout, " \"arguments\" \"%s\"", id_resp_arguments);
++    } else {
++	prot_printf(pout, " \"arguments\" NIL");
++    }
++#endif
++
++    /* SASL information */
++    snprintf(env_buf, MAXIDVALUELEN,"Built w/Cyrus SASL %d.%d.%d",
++	     SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP);
++
++    sasl_version(&sasl_imp, &sasl_ver);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; Running w/%s %d.%d.%d", sasl_imp,
++	     (sasl_ver & 0xFF000000) >> 24,
++	     (sasl_ver & 0x00FF0000) >> 16,
++	     (sasl_ver & 0x0000FFFF));
++
++    /* add the environment info */
++#ifdef DB_VERSION_STRING
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; Built w/%s", DB_VERSION_STRING);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; Running w/%s", db_version(NULL, NULL, NULL));
++#endif
++#ifdef HAVE_SSL
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; Built w/%s", OPENSSL_VERSION_TEXT);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; Running w/%s", SSLeay_version(SSLEAY_VERSION));
++#ifdef EGD_SOCKET
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     " (with EGD)");
++#endif
++#endif
++#ifdef USE_SIEVE
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; %s", SIEVE_VERSION);
++#endif
++#ifdef HAVE_LIBWRAP
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; TCP Wrappers");
++#endif
++#ifdef HAVE_UCDSNMP
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; UCD-SNMP %s", VersionInfo);
++#endif
++#ifdef HAVE_NETSNMP
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; NET-SNMP");
++#endif
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; mmap = %s", map_method_desc);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; lock = %s", lock_method_desc);
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     "; nonblock = %s", nonblock_method_desc);
++#ifdef HAVE_KRB
++    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++	     " (%s)", krb4_version);
++#endif
++    if (idle_method_desc)
++	snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++		 "; idle = %s", idle_method_desc);
++
++    prot_printf(pout, " \"environment\" \"%s\"", env_buf);
++}
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-04-18 20:39:34.000000000 +0200
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/lib/imapoptions	2006-04-18 20:39:35.706094585 +0200
+@@ -199,6 +199,14 @@
+ { "deleteright", "c", STRING }
+ /* The right that a user needs to delete a mailbox. */
+ 
++{ "dracinterval", 0, INT }
++/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
++   Control) by the pop3d and imapd daemons.  Also sets the interval
++   (in minutes) between re-authorization requests made by imapd. */
++
++{ "drachost", "localhost", STRING }
++/* Hostname of the RPC dracd server. */
++
+ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
+ /* The cyrusdb backend to use for the duplicate delivery suppression
+    and sieve. */
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions.orig /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/lib/imapoptions.orig
+--- cyrus-imapd-2.2.13/lib/imapoptions.orig	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.bMlzdR/cyrus-imapd-2.2.13/lib/imapoptions.orig	2006-04-18 20:39:35.707094488 +0200
+@@ -0,0 +1,895 @@
++# things inside of C comments get copied to the manpage
++# things starting with # are ignored
++
++/* .\" -*- nroff -*-
++.TH IMAPD.CONF 5 "Project Cyrus" CMU
++.\" 
++.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
++.\"
++.\" Redistribution and use in source and binary forms, with or without
++.\" modification, are permitted provided that the following conditions
++.\" are met:
++.\"
++.\" 1. Redistributions of source code must retain the above copyright
++.\"    notice, this list of conditions and the following disclaimer. 
++.\"
++.\" 2. Redistributions in binary form must reproduce the above copyright
++.\"    notice, this list of conditions and the following disclaimer in
++.\"    the documentation and/or other materials provided with the
++.\"    distribution.
++.\"
++.\" 3. The name "Carnegie Mellon University" must not be used to
++.\"    endorse or promote products derived from this software without
++.\"    prior written permission. For permission or any other legal
++.\"    details, please contact  
++.\"      Office of Technology Transfer
++.\"      Carnegie Mellon University
++.\"      5000 Forbes Avenue
++.\"      Pittsburgh, PA  15213-3890
++.\"      (412) 268-4387, fax: (412) 268-7395
++.\"      tech-transfer@andrew.cmu.edu
++.\"
++.\" 4. Redistributions of any form whatsoever must retain the following
++.\"    acknowledgment:
++.\"    "This product includes software developed by Computing Services
++.\"     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++.\"
++.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++.\" 
++.\" $Id: imapoptions,v 1.36 2006/03/30 15:49:58 murch Exp $
++.SH NAME
++imapd.conf \- IMAP configuration file
++.SH DESCRIPTION
++\fB/etc/imapd.conf\fR 
++is the configuration file for the Cyrus IMAP server.  It defines
++local parameters for IMAP. 
++.PP
++Each line of the \fB/etc/imapd.conf\fR file has the form
++.IP
++\fIoption\fR: \fIvalue\fR
++.PP
++where \fIoption\fR is the name of the configuration option being set
++and \fIvalue\fR is the value that the configuration option is being
++set to.
++.PP
++Blank lines and lines beginning with ``#'' are ignored.
++.PP
++For boolean and enumerated options, the values ``yes'', ``on'', ``t'',
++``true'' and ``1'' turn the option on, the values ``no'', ``off'',
++``f'', ``false'' and ``0'' turn the option off.
++.SH FIELD DESCRIPTIONS
++.PP
++The sections below detail options that can be placed in the
++\fB/etc/imapd.conf\fR file, and show each option's default value.
++Some options have no default value, these are listed with
++``<no default>''.  Some options default to the empty string, these
++are listed with ``<none>''.
++*/
++
++# OPTIONS
++
++{ "admins", "", STRING }
++/* The list of userids with administrative rights.  Separate each userid
++   with a space.  Sites using Kerberos authentication may use
++   separate "admin" instances.
++.PP
++   Note that accounts used by users should not be administrators.
++   Administrative accounts should not receive mail.  That is, if user
++   "jbRo" is a user reading mail, he should not also be in the admins line.
++   Some problems may occur otherwise, most notably the ability of
++   administrators to create top-level mailboxes visible to users,
++   but not writable by users. */
++
++{ "afspts_localrealms", NULL, STRING }
++/* The list of realms which are to be treated as local, and thus stripped
++   during identifier canoicalization (for the AFSPTS ptloader module).
++   This is different from loginrealms in that it occurs later in the
++   authorization process (as the user id is canonified for PTS lookup) */
++
++{ "afspts_mycell", NULL, STRING }
++/* Cell to use for AFS PTS lookups.  Defaults to the local cell. */
++
++{ "allowallsubscribe", 0, SWITCH }
++/* Allow subscription to nonexistent mailboxes.  This option is
++   typically used on backend servers in a Murder so that users can
++   subscribe to mailboxes that don't reside on their "home" server.
++   This option can also be used as a workaround for IMAP clients which
++   don't play well with nonexistent or unselectable mailboxes (eg.
++   Microsoft Outlook). */
++
++{ "allowanonymouslogin", 0, SWITCH }
++/* Permit logins by the user "anonymous" using any password.  Also
++   allows use of the SASL ANONYMOUS mechanism. */
++
++{ "allowapop", 1, SWITCH }
++/* Allow use of the POP3 APOP authentication command.
++.PP
++  Note that this command requires that SASL is compiled with APOP
++  support, that the plaintext passwords are available in a SASL auxprop
++  backend (eg. sasldb), and that the system can provide enough entropy
++  (eg. from /dev/urandom) to create a challenge in the banner. */
++
++{ "allownewnews", 0, SWITCH }
++/* Allow use of the NNTP NEWNEWS command.
++.PP
++  Note that this is a very expensive command and should only be
++  enabled when absolutely necessary. */
++
++{ "allowplaintext", 1, SWITCH }
++/* Allow the use of cleartext passwords on the wire. */
++   
++{ "allowusermoves", 0, SWITCH }
++/* Allow moving user accounts (with associated meta-data) via RENAME
++   or XFER.
++.PP
++  Note that measures should be taken to make sure that the user being
++  moved is not logged in, and can not login during the move.  Failure
++  to do so may result in the user's meta-data (seen state,
++  subscriptions, etc) being corrupted or out of date. */
++   
++{ "altnamespace", 0, SWITCH }
++/* Use the alternate IMAP namespace, where personal folders reside at the
++   same level in the hierarchy as INBOX.
++.PP
++   This option ONLY applies where interaction takes place with the
++   client/user.  Currently this is limited to the IMAP protocol (imapd)
++   and Sieve scripts (lmtpd).  This option does NOT apply to admin tools
++   such as cyradm (admins ONLY), reconstruct, quota, etc., NOR does it
++   affect LMTP delivery of messages directly to mailboxes via
++   plus-addressing. */
++
++{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist")}
++/* The cyrusdb backend to use for mailbox annotations. */
++
++{ "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")}
++/* The authorization mechanism to use. */
++
++{ "autocreatequota", 0, INT }
++/* 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. */
++
++{ "berkeley_cachesize", 512, INT }
++/* Size (in kilobytes) of the shared memory buffer pool (cache) used
++   by the berkeley environment.  The minimum allowed value is 20.  The
++   maximum allowed value is 4194303 (4GB). */
++
++{ "berkeley_locks_max", 50000, INT }
++/* Maximum number of locks to be held or requested in the berkeley
++   environment. */
++
++{ "berkeley_txns_max", 100, INT }
++/* Maximum number of transactions to be supported in the berkeley
++   environment. */
++
++{ "client_timeout", 10, INT }
++/* Number of seconds to wait before returning a timeout failure when
++   performing a client connection (e.g. in a murder enviornment) */
++
++{ "configdirectory", NULL, STRING }
++/* The pathname of the IMAP configuration directory.  This field is
++   required. */
++
++{ "debug_command", NULL, STRING }
++/* Debug command to be used by processes started with -D option.  The string
++   is a C format string that gets 3 options: the first is the name of the
++   executable (without path).  The second is the pid (integer) and the third
++   is the service ID.  Example: /usr/local/bin/gdb /usr/cyrus/bin/%s %d */
++
++{ "defaultacl", "anyone lrs", STRING }
++/* The Access Control List (ACL) placed on a newly-created (non-user)
++   mailbox that does not have a parent mailbox. */
++
++{ "defaultdomain", NULL, STRING }
++/* The default domain for virtual domain support. Note that this domain
++   is stripped from the email-address transmitted using LMTP, but it
++   is not stripped from usernames at login-time. For imapd/pop3d, 
++   "user" and "user@defaultdomain" specify two different users.
++   Please check install-virtdomains.html for details. */
++
++{ "defaultpartition", "default", STRING }
++/* The partition name used by default for new mailboxes. */
++
++{ "deleteright", "c", STRING }
++/* The right that a user needs to delete a mailbox. */
++
++{ "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
++/* The cyrusdb backend to use for the duplicate delivery suppression
++   and sieve. */
++
++{ "duplicatesuppression", 1, SWITCH }
++/* 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. */
++
++{ "foolstupidclients", 0, SWITCH }
++/* If enabled, only list the personal namespace when a LIST "*" is performed.
++   (it changes the request to a LIST "INBOX*" */
++
++{ "force_sasl_client_mech", NULL, STRING }
++/* Force preference of a given SASL mechanism for client side operations
++   (e.g. murder enviornments).  This is separate from (and overridden by)
++   the ability to use the <host shortname>_mechs option to set prefered
++   mechanisms for a specific host */
++
++{ "fulldirhash", 0, SWITCH }
++/* If enabled, uses an improved directory hashing scheme which hashes
++   the entire username instead of using just the first letter.  This
++   changes hash algorithm used for quota and user directories and if
++   \fIhashimapspool\fR is enabled, the entire mail spool.
++.PP
++   Note that this option can NOT be changed on a live system.  The
++   server must be quiesced and then the directories moved with the
++   \fBrehash\fR utility. */
++
++{ "hashimapspool", 0, SWITCH }
++/* 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. */
++
++# Commented out - there's no such thing as "hostname_mechs", but we need
++# this for the man page
++# { "hostname_mechs", NULL, STRING }
++/* Force a particuar list of SASL mechanisms to be used when authenticating
++   to the backend server hostname (where hostname is the short hostname of
++   the server in question). If it is not specified it will query the server
++   for available mechanisms and pick one to use. - Cyrus Murder */
++
++# Commented out - there's no such thing as "hostname_password", but we need
++# this for the man page
++# { "hostname_password", NULL, STRING }
++/* The password to use for authentication to the backend server hostname
++   (where hostname is the short hostname of the server) - Cyrus Murder */
++
++{ "idlesocket", "{configdirectory}/socket/idle", STRING }
++/* Unix domain socket that idled listens on. */
++
++{ "ignorereference", 0, SWITCH }
++/* For backwards compatibility with Cyrus 1.5.10 and earlier -- ignore
++  the reference argument in LIST or LSUB commands. */
++
++{ "imapidlepoll", 60, INT }
++/* 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). */
++
++{ "imapidresponse", 1, SWITCH }
++/* 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. */
++
++{ "imapmagicplus", 0, SWITCH }
++/* Only list a restricted set of mailboxes via IMAP by using
++   userid+namespace syntax as the authentication/authorization id.
++   Using userid+ (with an empty namespace) will list only subscribed
++   mailboxes. */ 
++
++{ "implicit_owner_rights", "lca", STRING }
++/* The implicit Access Control List (ACL) for the owner of a mailbox. */
++
++# Commented out - there's no such thing as "@include", but we need
++# this for the man page
++# { "@include", NULL, STRING }
++/* Directive which includes the specified file as part of the
++   configuration.  If the path to the file is not absolute, CYRUS_PATH
++   is prepended. */
++
++{ "ldap_authz", NULL, STRING }
++/* SASL authorization ID for the LDAP server */
++
++{ "ldap_base", "", STRING }
++/* Contains the LDAP base dn for the LDAP ptloader module */
++
++{ "ldap_bind_dn", NULL, STRING }
++/* Bind DN for the connection to the LDAP server (simple bind).
++   Do not use for anonymous simple binds */
++
++{ "ldap_deref", "never", STRINGLIST("search", "find", "always", "never") }
++/* Specify how aliases dereferencing is handled during search. */
++
++{ "ldap_filter", "(uid=%u)", STRING }
++/* Specify a filter that searches user identifiers.  The following tokens can be
++   used in the filter string:
++
++   %%   = %
++   %u   = user
++   %U   = user portion of %u (%U = test when %u = test@domain.tld)
++   %d   = domain portion of %u if available (%d = domain.tld when %u =
++          %test@domain.tld), otherwise same as %r
++   %D   = user dn.  (use when ldap_member_method: filter)
++   %1-9 = domain tokens (%1 = tld, %2 = domain when %d = domain.tld)
++
++   ldap_filter is not used when ldap_sasl is enabled. */
++
++{ "ldap_group_base", "", STRING }
++/* LDAP base dn for ldap_group_filter. */
++
++{ "ldap_group_filter", "(cn=%u)", STRING }
++/* Specify a filter that searches for group identifiers.
++   See ldap_filter for more options. */ 
++
++{ "ldap_group_scope", "sub", STRINGLIST("sub", "one", "base") }
++/* Specify search scope for ldap_group_filter. */
++
++{ "ldap_id", NULL, STRING }
++/* SASL authentication ID for the LDAP server */
++
++{ "ldap_mech", NULL, STRING }
++/* SASL mechanism for LDAP authentication */
++
++{ "ldap_member_attribute", NULL, STRING }
++/* See ldap_member_method. */
++
++{ "ldap_member_base", "", STRING }
++/* LDAP base dn for ldap_member_filter. */
++
++{ "ldap_member_filter", "(member=%D)", STRING }
++/* Specify a filter for "ldap_member_method: filter".  
++   See ldap_filter for more options. */ 
++
++{ "ldap_member_method", "attribute", STRINGLIST("attribute", "filter") }
++/* Specify a group method.  The "attribute" method retrieves groups from 
++   a multi-valued attribute specified in ldap_member_attribute.  
++
++   The "filter" method uses a filter, specified by ldap_member_filter, to find
++   groups; ldap_member_attribute is a single-value attribute group name. */
++
++{ "ldap_member_scope", "sub", STRINGLIST("sub", "one", "base") }
++/* Specify search scope for ldap_member_filter. */
++
++{ "ldap_password", NULL, STRING }
++/* Password for the connection to the LDAP server (SASL and simple bind).  
++   Do not use for anonymous simple binds */
++
++{ "ldap_realm", NULL, STRING }
++/* SASL realm for LDAP authentication */
++
++{ "ldap_referrals", 0, SWITCH }
++/* Specify whether or not the client should follow referrals. */
++
++{ "ldap_restart", 1, SWITCH }
++/* Specify whether or not LDAP I/O operations are automatically restarted
++   if they abort prematurely. */
++
++{ "ldap_sasl", 1, SWITCH }
++/* Use SASL for LDAP binds in the LDAP PTS module. */
++
++{ "ldap_sasl_authc", NULL, STRING }
++/* Depricated.  Use ldap_id */
++
++{ "ldap_sasl_authz", NULL, STRING }
++/* Depricated.  Use ldap_authz */
++
++{ "ldap_sasl_mech", NULL, STRING }
++/* Depricated.  Use ldap_mech */
++
++{ "ldap_sasl_password", NULL, STRING }
++/* Depricated.  User ldap_password */
++
++{ "ldap_sasl_realm", NULL, STRING }
++/* Depricated.  Use ldap_realm */
++
++{ "ldap_scope", "sub", STRINGLIST("sub", "one", "base") }
++/* Specify search scope. */
++
++{ "ldap_servers", "ldap://localhost/", STRING }
++/* Depricated.  Use ldap_uri */
++
++{ "ldap_size_limit", 1, INT }
++/* Specify a number of entries for a search request to return. */
++
++{ "ldap_start_tls", 0, SWITCH }
++/* Use StartTLS extended operation.  Do not use ldaps: ldap_uri when
++   this option is enabled. */
++
++{ "ldap_time_limit", 5, INT }
++/* Specify a number of seconds for a search request to complete. */
++
++{ "ldap_timeout", 5, INT }
++/* Specify a number of seconds a search can take before timing out. */
++
++{ "ldap_tls_cacert_dir", NULL, STRING }
++/* Path to directory with CA (Certificate Authority) certificates. */
++
++{ "ldap_tls_cacert_file", NULL, STRING }
++/* File containing CA (Certificate Authority) certificate(s). */
++
++{ "ldap_tls_cert", NULL, STRING }
++/* File containing the client certificate. */
++
++{ "ldap_tls_check_peer", 0, SWITCH }
++/* Require and verify server certificate.  If this option is yes,
++   you must specify ldap_tls_cacert_file or ldap_tls_cacert_dir. */
++
++{ "ldap_tls_ciphers", NULL, STRING }
++/* List of SSL/TLS ciphers to allow.  The format of the string is
++   described in ciphers(1). */
++
++{ "ldap_tls_key", NULL, STRING }
++/* File containing the private client key. */
++
++{ "ldap_uri", NULL, STRING }
++/* Contains a list of the URLs of all the LDAP servers when using the
++   LDAP PTS module. */
++
++{ "ldap_version", 3, INT }
++/* Specify the LDAP protocol version.  If ldap_start_tls and/or
++   ldap_use_sasl are enabled, ldap_version will be automatiacally
++   set to 3. */
++
++{ "lmtp_downcase_rcpt", 0, SWITCH }
++/* If enabled, lmtpd will convert the recipient address to lowercase
++   (up to a '+' character, if present). */
++
++{ "lmtp_over_quota_perm_failure", 0, SWITCH }
++/* If enabled, lmtpd returns a permanent failure code when a user's
++   mailbox is over quota.  By default, the failure is temporary,
++   causing the MTA to queue the message and retry later. */
++
++{ "lmtpsocket", "{configdirectory}/socket/lmtp", STRING }
++/* Unix domain socket that lmtpd listens on, used by deliver(8). This should
++   match the path specified in cyrus.conf(5). */
++
++# xxx how does this tie into virtual domains?
++{ "loginrealms", "", STRING }
++/* The list of remote realms whose users may authenticate using cross-realm
++   authentication identifiers.  Seperate each realm name by a space.  (A
++   cross-realm identity is considered any identity returned by SASL
++   with an "@" in it.) Note that to support multiple virtual domains
++   on the same interface/IP, you need to list them all as loginreals.
++   If you don't list them here, your users probably won't be able to
++   log in. */
++
++{ "loginuseacl", 0, SWITCH }
++/* If enabled, any authentication identity which has \fBa\fR rights on a
++   user's INBOX may log in as that user. */
++
++{ "logtimestamps", 0, SWITCH }
++/* Include notations in the protocol telemetry logs indicating the number of
++   seconds since the last command or response. */
++
++{ "mailnotifier", NULL, STRING }
++/* Notifyd(8) method to use for "MAIL" notifications.  If not set, "MAIL"
++   notifications are disabled. */
++
++{ "maxmessagesize", 0, INT }
++/* Maximum incoming LMTP message size.  If non-zero, lmtpd will reject
++   messages larger than \fImaxmessagesize\fR bytes.  If set to 0, this
++   will allow messages of any size (the default). */
++
++{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
++/* The cyrusdb backend to use for the mailbox list. */
++
++{ "munge8bit", 1, SWITCH }
++/* If enabled, lmtpd changes 8-bit characters to `X'. Also see reject8bit.
++   (A proper soultion to non-ASCII characters in headers is offered by  
++   RFC 2047 and its predecessors.) */
++
++# xxx badly worded
++{ "mupdate_connections_max", 128, INT }
++/* The max number of connections that a mupdate process will allow, this
++   is related to the number of file descriptors in the mupdate process.
++   Beyond this number connections will be immedately issued a BYE response. */
++
++{ "mupdate_authname", NULL, STRING }
++/* The SASL username (Authentication Name) to use when authenticating to the
++   mupdate server (if needed). */
++
++{ "mupdate_password", NULL, STRING }
++/* The SASL password (if needed) to use when authenticating to the
++   mupdate server. */
++
++{ "mupdate_port", 3905, INT }
++/* The port of the mupdate server for the Cyrus Murder */
++
++{ "mupdate_realm", NULL, STRING }
++/* The SASL realm (if needed) to use when authenticating to the mupdate
++   server. */
++
++{ "mupdate_retry_delay", 20, INT }
++/* The base time to wait between connection retries to the mupdate server. */
++
++{ "mupdate_server", NULL, STRING }
++/* The mupdate server for the Cyrus Murder */
++
++{ "mupdate_workers_start", 5, INT }
++/* The number of mupdate worker threads to start */
++
++{ "mupdate_workers_minspare", 2, INT }
++/* The minimum number of idle mupdate worker threads */
++
++{ "mupdate_workers_maxspare", 10, INT }
++/* The maximum number of idle mupdate worker threads */
++
++{ "mupdate_workers_max", 50, INT }
++/* The maximum number of mupdate worker threads (overall) */
++
++{ "mupdate_username", "", STRING }
++/* The SASL username (Authorization Name) to use when authenticating to
++   the mupdate server */
++
++{ "netscapeurl", "http://asg.web.cmu.edu/cyrus/imapd/netscape-admin.html", STRING }
++/* 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. */
++
++{ "newsmaster", "news", STRING }
++/* Userid that is used for checking access controls when executing
++   Usenet control messages.  For instance, to allow articles to be
++   automatically deleted by cancel messages, give the "news" user
++   the 'd' right on the desired mailboxes.  To allow newsgroups to be 
++   automatically created, deleted and renamed by the corresponding
++   control messages, give the "news" user the 'c' right on the desired
++   mailbox hierarchies. */
++
++{ "newspeer", NULL, STRING }
++/* A list of whitespace-separated news server specifications to which
++   articles should be fed.  Each server specification is a string of
++   the form [user[:pass]@]host[:port][/wildmat] where 'host' is the fully
++   qualified hostname of the server, 'port' is the port on which the
++   server is listening, 'user' and 'pass' are the authentication
++   credentials and 'wildmat' is a pattern that specifies which groups
++   should be fed.  If no 'port' is specified, port 119 is used.  If
++   no 'wildmat' is specified, all groups are fed.  If 'user' is specified
++   (even if empty), then the NNTP POST command will be used to feed
++   the article to the server, otherwise the IHAVE command will be
++   used.
++.br
++.sp
++   A '@' may be used in place of '!' in the wildmat to prevent feeding
++   articles cross-posted to the given group, otherwise cross-posted
++   articles are fed if any part of the wildmat matches.  For example,
++   the string "peer.example.com:*,!control.*,@local.*" would feed all
++   groups except control messages and local groups to
++   peer.example.com.  In the case of cross-posting to local groups,
++   these articles would not be fed. */
++
++{ "newspostuser", NULL, STRING }
++/* Userid used to deliver usenet articles to newsgroup folders
++   (usually via lmtp2nntp).  For example, if set to "post", email sent
++   to "post+comp.mail.imap" would be delivered to the "comp.mail.imap"
++   folder.
++.br
++.sp
++   When set, the Cyrus NNTP server will add a \fITo:\fR header to each
++   incoming usenet article.  This \fITo:\fR header will contain email
++   delivery addresses corresponding to each newsgroup in the
++   \fINewsgroups:\fR header.  By default, a \fITo:\fR header is not
++   added to usenet articles. */
++
++{ "newsprefix", NULL, STRING }
++/* Prefix to be prepended to newsgroup names to make the corresponding
++   IMAP mailbox names. */
++
++{ "notifysocket", "{configdirectory}/socket/notify", STRING }
++/* Unix domain socket that the mail notification daemon listens on. */
++
++# Commented out - there's no such thing as "partition-name", but we need
++# this for the man page
++# { "partition-name", NULL, STRING }
++/* The pathname of the partition \fIname\fR.  At least one field, for the
++   partition named in the \fBdefaultpartition\fR option, is required.
++   For example, if the value of the \fBdefaultpartion\fR option is
++   \fBdefault\fR, then the \fBpartition-default\fR field is required. */
++
++{ "plaintextloginpause", 0, INT }
++/* 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.  (This does not
++   affect the use of PLAIN in SASL authentications.) */
++
++{ "plaintextloginalert", NULL, STRING }
++/* Message to send to client after a successful plaintext login. */
++
++{ "popexpiretime", -1, INT }
++/* 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. */
++
++{ "popminpoll", 0, INT }
++/* Set the minimum amount of time the server forces users to wait
++   between successive POP logins, in minutes. */ 
++
++{ "poppollpadding", 1, INT }
++/* Create a softer minimum poll restriction.  Allows \fIpoppollpadding\fR
++   connections before the minpoll restriction is triggered.  Additionally,
++   one padding entry is recovered every \fIpopminpoll\fR minutes.
++   This allows for the occasional polling rate faster than popminpoll, 
++   (i.e. for clients that require a send/recieve to send mail) but still 
++   enforces the rate long-term.  Default is 1 (disabled).
++.br
++.sp
++   The easiest way to think of it is a queue of past connections, with one
++   slot being filled for every connection, and one slot being cleared 
++   every \fIpopminpoll\fR minutes. When the queue is full, the user
++   will not be able to check mail again until a slot is cleared.  If the 
++   user waits a sufficent amount of time, they will get back many or all
++   of the slots. */
++
++{ "poptimeout", 10, INT }
++/* Set the length of the POP server's inactivity autologout timer,    
++   in minutes.  The minimum value is 10, the default. */
++
++{ "popuseacl", 0, SWITCH }
++/* Enforce IMAP ACLs in the pop server.  Due to the nature of the POP3
++   protocol, the only rights which are used by the pop server are 'r'
++   and 'd' for the owner of the mailbox.  The 'r' right allows the
++   user to open the mailbox and list/retrieve messages.  The 'd' right
++   allows the user to delete messages. */
++
++{ "postmaster", "postmaster", STRING }
++/* Username that is used as the 'From' address in rejection MDNs produced
++   by sieve. */
++   
++{ "postspec", NULL, STRING }
++
++{ "postuser", "", STRING }
++/* 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. */ 
++
++{ "proxy_authname", "proxy", STRING }
++/* The authentication name to use when authenticating to a backend server
++   in the Cyrus Murder. */
++
++{ "proxy_password", NULL, STRING }
++/* The default password to use when authenticating to a backend server
++   in the Cyrus Murder.  May be overridden on a host-specific basis using
++   the hostname_password option. */
++
++{ "proxy_realm", NULL, STRING }
++/* The authentication realm to use when authenticating to a backend server
++   in the Cyrus Murder */
++
++{ "proxyd_allow_status_referral", 0, SWITCH }
++/* Set to true to allow proxyd to issue referrals to clients that support it
++   when answering the STATUS command.  This is disabled by default since
++   some clients issue many STATUS commands in a row, and do not cache the
++   connections that these referrals would cause, thus resulting in a higher
++   authentication load on the respective backend server. */
++
++{ "proxyservers", NULL, STRING }
++/* 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. */ 
++
++{ "pts_module", "afskrb", STRINGLIST("afskrb", "ldap") }
++/* The PTS module to use. */
++
++{ "ptloader_sock", NULL, STRING }
++/* Unix domain socket that ptloader listens on.
++   (defaults to configdir/ptclient/ptsock) */
++
++{ "ptscache_db", "berkeley", STRINGLIST("berkeley", "berkeley-hash", "skiplist")}
++/* The cyrusdb backend to use for the pts cache. */
++
++{ "ptscache_timeout", 10800, INT }
++/* The timeout (in seconds) for the PTS cache database when using the
++   auth_krb_pts authorization method (default: 3 hours). */
++
++{ "ptskrb5_convert524", 1, SWITCH }
++/* When using the AFSKRB ptloader module with Kerberos 5 canonicalization,
++   do the final 524 conversion to get a n AFS style name (using '.' instead
++   of '/', and using short names */
++
++{ "ptskrb5_strip_default_realm", 1, SWITCH }
++/* When using the AFSKRB ptloader module with Kerberos 5 canonicalization,
++   strip the default realm from the userid (this does not affect the stripping
++   of realms specified by the afspts_localrealms option) */
++
++{ "quota_db", "quotalegacy", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "quotalegacy")}
++/* The cyrusdb backend to use for quotas. */
++
++{ "quotawarn", 90, INT }
++/* The percent of quota utilization over which the server generates
++   warnings. */
++
++{ "quotawarnkb", 0, INT }
++/* The maximum amount of free space (in kB) in which to give a quota
++   warning (if this value is 0, or if the quota is smaller than this
++   amount, than warnings are always given). */
++
++{ "reject8bit", 0, SWITCH }
++/* If enabled, lmtpd rejects messages with 8-bit characters in the
++   headers. Also see munge8bit, which is only applied if reject8bit is
++   not activated. (A proper soultion to non-ASCII characters in headers
++   is offered by RFC 2047 and its predecessors.) */
++
++{ "rfc2046_strict", 0, SWITCH }
++/* If enabled, imapd will be strict (per RFC 2046) when matching MIME
++   boundary strings.  This means that boundaries containing other
++   boundaries as substrings will be treated as identical.  Since
++   enabling this option will break some messages created by Eudora 5.1
++   (and earlier), it is recommended that it be left disabled unless
++   there is good reason to do otherwise. */
++
++{ "rfc3028_strict", 1, SWITCH }
++/* If enabled, Sieve will be strict (per RFC 3028) with regards to
++   which headers are allowed to be used in address and envelope tests.
++   This means that only those headers which are defined to contain addresses
++   will be allowed in address tests and only "to" and "from" will be
++   allowed in envelope tests.  When disabled, ANY grammatically correct header
++   will be allowed. */
++
++# Commented out - used by libsasl
++# { "sasl_auto_transition", 0, SWITCH }
++/* If enabled, the SASL library will automatically create authentication
++   secrets when given a plaintext password.  See the SASL documentation. */
++
++{ "sasl_maximum_layer", 256, INT }
++/* Maximum SSF (security strength factor) that the server will allow a
++   client to negotiate. */
++
++{ "sasl_minimum_layer", 0, INT }
++/* 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. */
++
++# Commented out - used by libsasl
++# { "sasl_option", 0, STRING }
++/* Any SASL option can be set by preceeding it with "sasl_".  This
++   file overrides the SASL configuration file. */
++
++# Commented out - used by libsasl
++# { "sasl_pwcheck_method", NULL, STRING }
++/* The mechanism used by the server to verify plaintext passwords. 
++   Possible values include "auxprop", "saslauthd", and "pwcheck". */
++
++{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
++/* The cyrusdb backend to use for the seen state. */
++
++{ "sendmail", "/usr/lib/sendmail", STRING }
++/* The pathname of the sendmail executable.  Sieve invokes sendmail
++   for sending rejections, redirects and vacation responses. */
++
++{ "servername", NULL, STRING }
++/* 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. */
++   
++{ "sharedprefix", "Shared Folders", STRING }
++/* If using the alternate IMAP namespace, the prefix for the shared
++   namespace.  The hierarchy delimiter will be automatically appended. */
++
++{ "sieve_maxscriptsize", 32, INT }
++/* Maximum size (in kilobytes) any sieve script can be, enforced at
++   submission by timsieved(8). */
++
++{ "sieve_maxscripts", 5, INT }
++/* Maximum number of sieve scripts any user may have, enforced at
++   submission by timsieved(8). */
++   
++{ "sievedir", "/usr/sieve", STRING }
++/* If sieveusehomedir is false, this directory is searched for Sieve
++   scripts. */
++
++{ "sievenotifier", NULL, STRING }
++/* Notifyd(8) method to use for "SIEVE" notifications.  If not set, "SIEVE"
++   notifications are disabled.
++.PP
++   This method is only used when no method is specified in the script. */
++
++{ "sieveusehomedir", 0, SWITCH }
++/* If enabled, lmtpd will look for Sieve scripts in user's home
++   directories: ~user/.sieve. */
++
++{ "singleinstancestore", 1, SWITCH }
++/* If enabled, imapd, lmtpd and nntpd attempt to only write one copy
++   of a message per partition and create hard links, resulting in a
++   potentially large disk savings. */
++
++{ "skiplist_unsafe", 0, SWITCH }
++/* If enabled, this option forces the skiplist cyrusdb backend to
++   not sync writes to the disk.  Enabling this option is NOT RECOMMENDED. */
++
++{ "soft_noauth", 1, SWITCH }
++/* If enabled, lmtpd returns temporary failures if the client does not
++   successfully authenticate.  Otherwise lmtpd returns permanant failures
++   (causing the mail to bounce immediately). */
++
++{ "srvtab", "", STRING }
++/* The pathname of \fIsrvtab\fR file containing the server's private
++   key.  This option is passed to the SASL library and overrides its
++   default setting. */
++
++{ "subscription_db", "flat", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
++/* The cyrusdb backend to use for the subscriptions list. */
++
++{ "syslog_prefix", NULL, STRING }
++/* String to be appended to the process name in syslog entries. */
++
++{ "temp_path", "/tmp", STRING }
++/* The pathname to store temporary files in */
++
++{ "timeout", 30, INT }   
++/* The length of the IMAP server's inactivity autologout timer,       
++   in minutes.  The minimum value is 30, the default. */
++
++{ "tls_ca_file", NULL, STRING }
++/* File containing one or more Certificate Authority (CA) certificates. */
++
++{ "tls_ca_path", NULL, STRING }
++/* Path to directory with certificates of CAs.  This directory must
++   have filenames with the hashed value of the certificate (see
++   openssl(XXX)). */
++
++{ "tlscache_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
++/* The cyrusdb backend to use for the TLS cache. */
++
++{ "tls_cert_file", NULL, STRING }
++/* File containing the certificate presented for server authentication
++   during STARTTLS.  A value of "disabled" will disable SSL/TLS. */
++
++{ "tls_cipher_list", "DEFAULT", STRING }
++/* The list of SSL/TLS ciphers to allow.  The format of the string is
++   described in ciphers(1). */
++
++{ "tls_key_file", NULL, STRING }
++/* File containing the private key belonging to the server
++   certificate.  A value of "disabled" will disable SSL/TLS. */
++
++{ "tls_require_cert", 0, SWITCH }
++/* Require a client certificate for ALL services (imap, pop3, lmtp, sieve). */
++
++{ "tls_session_timeout", 1440, INT }
++/* 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. */
++
++{ "umask", "077", STRING }
++/* The umask value used by various Cyrus IMAP programs. */
++
++{ "username_tolower", 1, SWITCH }
++/* Convert usernames to all lowercase before login/authenticate.  This
++   is useful with authentication backends which ignore case during
++   username lookups (such as LDAP).  */
++
++{ "userprefix", "Other Users", STRING }
++/* If using the alternate IMAP namespace, the prefix for the other users
++   namespace.  The hierarchy delimiter will be automatically appended. */
++
++# xxx badly worded
++{ "unix_group_enable", 1, SWITCH }
++/* Should we look up groups when using auth_unix (disable this if you are
++   not using groups in ACLs for your IMAP server, and you are using auth_unix
++   with a backend (such as LDAP) that can make getgrent() calls very
++   slow) */
++
++{ "unixhierarchysep", 0, SWITCH }
++/* Use the UNIX separator character '/' for delimiting levels of
++   mailbox hierarchy.  The default is to use the netnews separator
++   character '.'. */
++
++{ "virtdomains", "off", ENUM("off", "userid", "on") }
++/* Enable virtual domain support.  If enabled, the user's domain will
++   be determined by splitting a fully qualified userid at the last '@'
++   or '%' symbol.  If the userid is unqualified, and the virtdomains
++   option is set to "on", then the domain will be determined by doing
++   a reverse lookup on the IP address of the incoming network
++   interface, otherwise the user is assumed to be in the default
++   domain (if set). */
++
++/*
++.SH SEE ALSO
++.PP
++\fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR,
++\fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
++\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR
++*/
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/21-fix_config-parsing.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/21-fix_config-parsing.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21-fix_config-parsing.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix parsing of master.conf
+
+@DPATCH@
+diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c
+--- complete.dpatch/master/masterconf.c	2005-11-11 15:25:37.000000000 +0100
++++ /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c	2005-11-11 15:27:02.084797577 +0100
+@@ -150,8 +150,13 @@
+     const char *val = masterconf_getstring(e, key, NULL);
+ 
+     if (!val) return def;
+-    if (!isdigit((int) *val) && 
+-	(*val != '-' || !isdigit((int) val[1]))) return def;
++    if (!isdigit((int) *val) &&
++        (*val != '-' || !isdigit((int) val[1]))) {
++	syslog(LOG_DEBUG, "value '%s' for '%s' does not look like a number.",
++	     val, key);
++      return def;
++    }
++
+     return atoi(val);
+ }
+ 
+@@ -169,6 +174,10 @@
+ 	     (val[0] == 'o' && val[1] == 'n') || val[0] == 't') {
+ 	return 1;
+     }
++
++    syslog(LOG_DEBUG, "cannot interpret value '%s' for key '%s'. use y/n.",
++	   val, key);
++
+     return def;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/22-imapd_index_check.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/22-imapd_index_check.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22-imapd_index_check.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix usage of index_check()
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c	2005-11-11 16:01:19.000000000 +0100
++++ /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c	2005-11-11 16:01:37.190206572 +0100
+@@ -3175,8 +3175,8 @@
+ 
+     if (usinguid) {
+ 	fetchitems |= FETCH_UID;
+-	index_check(imapd_mailbox, 1, 0);
+     }
++    index_check(imapd_mailbox, 1, 0);
+ 
+     fetchargs.fetchitems = fetchitems;
+     r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs,
+@@ -3191,6 +3191,9 @@
+     } else if (fetchedsomething || usinguid) {
+ 	prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
+ 		    error_message(IMAP_OK_COMPLETED), mytime);
++	if(fetchargs.fetchitems & FETCH_SETSEEN) {
++	    index_check(imapd_mailbox,usinguid,1);
++	}
+     } else {
+ 	/* normal FETCH, nothing came back */
+ 	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+@@ -3309,7 +3312,8 @@
+ 
+     index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething);
+ 
+-    index_check(imapd_mailbox, 0, 0);
++    index_check(imapd_mailbox, 0,
++       fetchedsomething && (fetchargs.fetchitems & FETCH_SETSEEN));
+ 
+     if (fetchedsomething) {
+ 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+@@ -3441,7 +3445,9 @@
+     r = index_store(imapd_mailbox, sequence, usinguid, &storeargs,
+ 		    flag, nflags);
+ 
+-    if (usinguid) {
++    if(storeargs.seen || storeargs.operation==STORE_REPLACE) {
++	index_check(imapd_mailbox, usinguid, 1);
++    } else if (usinguid) {
+ 	index_check(imapd_mailbox, 1, 0);
+     }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/25-update_install-sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/25-update_install-sh.dpatch
@@ -0,0 +1,530 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_update_install.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update install-sh to a more recent version
+
+@DPATCH@
+diff -urN cyrus-imapd-2.2.12/install-sh cyrus-imapd-2.2.12~/install-sh
+--- cyrus-imapd-2.2.12/install-sh	2005-08-30 14:42:29.000000000 +0200
++++ cyrus-imapd-2.2.12~/install-sh	2005-08-30 14:36:59.000000000 +0200
+@@ -1,23 +1,52 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5.
++
++scriptversion=2005-02-02.21
++
++# 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 (C) 1994 X Consortium
++#
++# 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.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch.
+-#
+-
++# 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}"
+@@ -29,210 +58,266 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-tranformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+-    case $1 in
+-	-c) instcmd="$cpprog"
+-	    shift
+-	    continue;;
+-
+-	-d) dir_arg=true
+-	    shift
+-	    continue;;
+-
+-	-m) chmodcmd="$chmodprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-o) chowncmd="$chownprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-g) chgrpcmd="$chgrpprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-s) stripcmd="$stripprog"
+-	    shift
+-	    continue;;
+-
+-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+-	    shift
+-	    continue;;
+-
+-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+-	    shift
+-	    continue;;
+-
+-	*)  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
+-
+-if [ x"$src" = x ]
+-then
+-	echo "install:	no input file specified"
+-	exit 1
+-else
+-	true
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+-	dst=$src
+-	src=""
+-	
+-	if [ -d $dst ]; then
+-		instcmd=:
+-	else
+-		instcmd=mkdir
+-	fi
+-else
+-
+-# 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 '*'.
+-
+-	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
+-
+-# 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
+-
+-	if [ -d $dst ]
+-	then
+-		dst="$dst"/`basename $src`
+-	else
+-		true
+-	fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='	
+-'
+-IFS="${IFS-${defaultIFS}}"
+-
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++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.
++
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
++
++    -d) dir_arg=true
++        shift
++        continue;;
++
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
++
++    --help) echo "$usage"; exit $?;;
++
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
++
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
++
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
+-pathcomp=''
++    -t) dstarg=$2
++	shift
++	shift
++	continue;;
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp="${pathcomp}${1}"
++    -T) no_target_directory=true
+ 	shift
++	continue;;
+ 
+-	if [ ! -d "${pathcomp}" ] ;
+-        then
+-		$mkdirprog "${pathcomp}"
+-	else
+-		true
+-	fi
++    --version) echo "$0 $scriptversion"; exit $?;;
+ 
+-	pathcomp="${pathcomp}/"
++    *)  # 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
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd $dst &&
+-
+-	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
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+-	if [ x"$transformarg" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		dstfile=`basename $dst $transformbasename | 
+-			sed $transformarg`$transformbasename
+-	fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+-	if [ x"$dstfile" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		true
+-	fi
+-
+-# Make a temp file name in the proper directory.
+-
+-	dsttmp=$dstdir/#inst.$$#
+ 
+-# Move or copy the file name to the temp name
+-
+-	$doit $instcmd $src $dsttmp &&
+-
+-	trap "rm -f ${dsttmp}" 0 &&
+-
+-# 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 $instcmd $src $dsttmp" command.
+-
+-	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 &&
+-
+-# Now rename the file to the real destination.
+-
+-	$doit $rmcmd -f $dstdir/$dstfile &&
+-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++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
+ 
+-fi &&
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
++
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
++
++    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
++
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
++
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
+ 
++    # 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
++
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++  # Make sure that the destination directory exists.
++
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    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
++
++    pathcomp=
++
++    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
++
++  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"; }
++
++  else
++    dstfile=`basename "$dst"`
++
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
++
++    # 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
++
++    # Copy the file name to the temp name.
++    $doit $cpprog "$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"; } &&
++
++    # 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.
++
++	   # 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
++	   } &&
++
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit 1; }
++done
+ 
+-exit 0
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); 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:
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/30-update_perlcalling.sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch
@@ -0,0 +1,493 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_update_perlcalling.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: updates calling of the perl interpreter to what we expect in Debian.
+## DP: More precisely: Call /usr/bin/perl directly instead of using some
+## DP: shell magic to locate perl and run it.
+## DP: NOTE: only some script use the "-w" or even the "-T" flag for perl.
+## DP:       This should be the default actually. 
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2005-05-24 22:44:39.039570899 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!/usr/bin/perl
+ 
+ #
+ # Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2005-05-24 22:44:39.038570809 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!/usr/bin/perl
+ 
+ #
+ # Created by Alison Greenwald 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2005-05-24 22:44:39.038570809 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5 
++#!/usr/bin/perl 
+ 
+ #
+ # Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl
+--- cyrus-imapd-2.2.12/contrib/mupdate-test.pl	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl	2005-05-24 22:44:39.048571710 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # Create a workload against a murder frontend
+ # that will give the MUPDATE server a workout.
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl	2005-05-24 22:44:39.058572611 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl	2005-05-24 22:44:39.057572521 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl	2005-05-24 22:44:39.059572701 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ #
+ # $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $
+ # 
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl	2005-05-24 22:44:39.057572521 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ # test-imsp.pl
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl	2005-05-24 22:44:39.061572881 +0200
+@@ -1,6 +1,4 @@
+-#! /bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-05-24 22:44:39.062572971 +0200
+@@ -1,6 +1,4 @@
+-#! /bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen
+--- cyrus-imapd-2.2.12/snmp/snmpgen	2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen	2005-05-24 22:44:39.073573962 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,25 +38,8 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # $Id: snmpgen,v 1.18 2005/04/11 06:08:58 shadow Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-w", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ #Tim Martin
+diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl
+--- cyrus-imapd-2.2.12/tools/arbitronsort.pl	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl	2005-05-24 22:44:39.018569008 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ #
+ # This script takes the output of arbitron (run without the -o option)
+diff -urNad cyrus-imapd-2.2.12/tools/config2header /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header
+--- cyrus-imapd-2.2.12/tools/config2header	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header	2005-05-24 22:44:39.017568918 +0200
+@@ -1,4 +1,5 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++#
+ # $Id: config2header,v 1.12 2005/04/19 18:54:32 shadow Exp $
+ #
+ # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
+@@ -39,24 +40,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use strict;
+diff -urNad cyrus-imapd-2.2.12/tools/config2man /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man
+--- cyrus-imapd-2.2.12/tools/config2man	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man	2005-05-24 22:44:39.020569188 +0200
+@@ -1,4 +1,5 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++#
+ # $Id: config2man,v 1.3 2003/12/09 18:33:52 ken3 Exp $
+ #
+ # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
+@@ -39,24 +40,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use strict;
+diff -urNad cyrus-imapd-2.2.12/tools/dohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash
+--- cyrus-imapd-2.2.12/tools/dohash	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash	2005-05-24 22:44:39.023569458 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,27 +38,10 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # script to upgrade from versions of imapd previous to 1.6.2
+ # make sure you run it as the cyrus user
+ # $Id: dohash,v 1.11 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:44:39.019569098 +0200
+@@ -1,4 +1,6 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++# 
++# Script for mass compilation of sieve scripts.
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,28 +40,11 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ #
+ # Script for mass compilation of sieve scripts.
+ #
+ # $Id: masssievec,v 1.5 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/mkimap /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap
+--- cyrus-imapd-2.2.12/tools/mkimap	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap	2005-05-24 22:44:39.030570089 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,25 +38,8 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # $Id: mkimap,v 1.17 2005/12/01 19:12:34 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ sub read_conf {
+diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups
+--- cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:44:39.022569368 +0200
+@@ -1,5 +1,8 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
++# Create newsgroups on imap server
++# Based on the make_fromactive.pl script by Tim Martin
++#
+ # Copyright (c) 2003 Carnegie Mellon University.  All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+@@ -38,29 +41,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-#
+-# Create newsgroups on imap server
+-# Based on the make_fromactive.pl script by Tim Martin
+-#
+-# $Id: mknewsgroups,v 1.2 2003/10/22 18:03:47 rjs3 Exp $
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use Getopt::Long;
+diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:44:39.029569999 +0200
+@@ -1,4 +1,8 @@
+-#!/bin/sh
++#!/usr/bin/perl
++# script to upgrade from simple hashing scheme to full hashing scheme
++# make sure you run it as the cyrus user
++# 
++# Written by Gary Mills <mills@cc.UManitoba.CA>
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,8 +42,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # script to upgrade from simple hashing scheme to full hashing scheme
+ # make sure you run it as the cyrus user
+ #
+@@ -47,21 +49,6 @@
+ #
+ # $Id: rehash,v 1.8 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/translatesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve
+--- cyrus-imapd-2.2.12/tools/translatesieve	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve	2005-05-24 22:44:39.027569818 +0200
+@@ -1,6 +1,4 @@
+-#!/bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl
+ # script to translate sieve scripts to use unixhierarchysep and/or altnamespace
+ # make sure you run it as the cyrus user
+ #!/usr/bin/perl
+@@ -45,21 +43,6 @@
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/undohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash
+--- cyrus-imapd-2.2.12/tools/undohash	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash	2005-05-24 22:44:39.028569908 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl -w
+ # script to downgrade from cyrus imapd 1.6.2+ to earlier.
+ # do NOT run this script while imapd's are running
+ # $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $
+diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve
+--- cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:44:39.021569278 +0200
+@@ -1,6 +1,4 @@
+-#!/bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # script to upgrade sievedir from imapd 1.6.13
+ # make sure you run it as the cyrus user
+ #!/usr/bin/perl
+@@ -45,21 +43,6 @@
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/35-masssievec_remove_unused_variable.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_masssievec_remove_unused_variable.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the $nosievedir variable which is set once but never used.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:52:49.000000000 +0200
++++ /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:53:24.124865338 +0200
+@@ -86,7 +86,6 @@
+ 	    push @configs, $1;
+ 	}
+ 	if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
+-	    $nosievedir = 1;
+ 	    print "you are storing sieve scripts in user's home directories, this script cannot deal with that\n";
+ 	    exit;
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/40-rehash_fix_pathes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_rehash_fix_pathes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix paths in tools/rehash
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:56:53.000000000 +0200
++++ /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:57:53.429121575 +0200
+@@ -170,7 +170,7 @@
+ $imapdconf = shift || "/etc/imapd.conf";
+ 
+ $yn = "y";
+-$sievedir = "/usr/sieve";
++$sievedir = "/var/spool/sieve";
+ $nosievedir = 0;
+ $hashispool = 0;
+ $virtdomains = 0;
+@@ -181,7 +181,7 @@
+     read_conf($conf);
+ }
+ 
+-if (! $confdir) { $confdir = "/var/imap"; }
++if (! $confdir) { $confdir = "/var/lib/cyrus"; }
+ 
+ if ($interactive) {
+     print "upgrade $confdir? ";
+@@ -555,6 +555,7 @@
+ 	      or die "couldn't rename .$i/$s/$t to $s/$t";
+ 	  }
+ 	  closedir MV;
++	  rmdir ".$i/$s" or die "could not remove .$i/$s"
+ 	}
+ 	closedir SUB;
+ 	rmdir ".$i" or die "could not remove .$i";
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/45-kolab2-annotations.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/45-kolab2-annotations.dpatch
@@ -0,0 +1,151 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45-kolab2-annotations.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add kolab2 compatible annotation functionality
+
+@DPATCH@
+diff -urNad cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c
+--- cyrus22-imapd-2.2.12/imap/annotate.c	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c	2005-06-30 13:15:22.121300304 +0200
+@@ -1667,6 +1667,11 @@
+     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
+ };
+ 
++const struct annotate_st_entry vendor_entry =
++    { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY,
++      ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
++      ACL_ADMIN, annotation_set_todb, NULL };
++
+ int annotatemore_store(char *mailbox,
+ 		       struct entryattlist *l,
+ 		       struct namespace *namespace,
+@@ -1679,6 +1684,7 @@
+     struct attvaluelist *av;
+     struct storedata sdata;
+     const struct annotate_st_entry *entries;
++    struct annotate_st_entry * working_entry;
+     time_t now = time(0);
+ 
+     memset(&sdata, 0, sizeof(struct storedata));
+@@ -1700,37 +1706,55 @@
+     while (e) {
+ 	int entrycount, attribs;
+ 	struct annotate_st_entry_list *nentry = NULL;
++	struct annotate_st_entry *ientry = NULL;
+ 
+ 	/* See if we support this entry */
++	working_entry = NULL;
+ 	for (entrycount = 0;
+ 	     entries[entrycount].name;
+ 	     entrycount++) {
+ 	    if (!strcmp(e->entry, entries[entrycount].name)) {
++	        working_entry = &(entries[entrycount]);
+ 		break;
+ 	    }
+ 	}
+-	if (!entries[entrycount].name) {
+-	    /* unknown annotation */
+-	    return IMAP_PERMISSION_DENIED;
++	if (working_entry==NULL) {
++	    /* test for generic vendor annotation */
++	    if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) &&
++	        (strlen(e->entry)>strlen("/vendor/"))) {
++	      working_entry = &(vendor_entry);
++	    }
++	    else {
++	        /* unknown annotation */
++	        return IMAP_PERMISSION_DENIED;
++	    }
+ 	}
+ 
+ 	/* Add this entry to our list only if it
+ 	   applies to our particular server type */
+-	if (entries[entrycount].proxytype == PROXY_AND_BACKEND
++	if (working_entry->proxytype == PROXY_AND_BACKEND
+ 	    || (proxy_store_func &&
+-		entries[entrycount].proxytype == PROXY_ONLY)
++		working_entry->proxytype == PROXY_ONLY)
+ 	    || (!proxy_store_func &&
+-		entries[entrycount].proxytype == BACKEND_ONLY)) {
++		working_entry->proxytype == BACKEND_ONLY)) {
++            ientry = xzmalloc(sizeof(struct annotate_st_entry));
++            ientry->name = e->entry;
++            ientry->type = working_entry->type;
++            ientry->proxytype = working_entry->proxytype;
++            ientry->attribs = working_entry->attribs;
++            ientry->acl = working_entry->acl;
++            ientry->set = working_entry->set;
++            ientry->rock = working_entry->rock;	
+ 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
+ 	    nentry->next = sdata.entry_list;
+-	    nentry->entry = &(entries[entrycount]);
++	    nentry->entry = ientry;
+ 	    nentry->shared.modifiedsince = now;
+ 	    nentry->priv.modifiedsince = now;
+ 	    sdata.entry_list = nentry;
+ 	}
+ 
+ 	/* See if we are allowed to set the given attributes. */
+-	attribs = entries[entrycount].attribs;
++	attribs = working_entry->attribs;
+ 	av = e->attvalues;
+ 	while (av) {
+ 	    const char *value;
+@@ -1740,7 +1764,7 @@
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1766,7 +1790,7 @@
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1868,6 +1892,12 @@
+     /* Free the entry list */
+     while (sdata.entry_list) {
+ 	struct annotate_st_entry_list *freeme = sdata.entry_list;
++	if (freeme != NULL){
++	    struct annotate_st_entry *freeme2 = freeme->entry;
++	    if (freeme2 != NULL) {
++	        free( freeme2 );
++	    }
++	}
+ 	sdata.entry_list = sdata.entry_list->next;
+ 	free(freeme);
+     }
+diff -urNad cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm
+--- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm	2005-06-30 13:16:29.270725801 +0200
+@@ -784,15 +784,19 @@
+ 		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
+ 		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
+ 		 "sieve" => "/vendor/cmu/cyrus-imapd/sieve",
+-		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
++		 "squat" => "/vendor/cmu/cyrus-imapd/squat",
++ 		 "folder-type" => "/vendor/kolab/folder-type",
++ 		 "h-share-uid" => "/vendor/kolab/h-share-uid" );
+ 
+   if(!$self->{support_annotatemore}) {
+     $self->{error} = "Remote does not support ANNOTATEMORE.";
+     return undef;
+   }
+ 
+-  if(!exists($values{$entry})) {
+-    $self->{error} = "Unknown parameter $entry";
++  if(exists($values{$entry})) {
++    $entry = $values{$entry};
++  } else {
++    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
+   }
+ 
+   $entry = $values{$entry};
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/60-lower-poptimeout-minimum.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/60-lower-poptimeout-minimum.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-lower-poptimeout-minimum.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Lower the minimum timeout for POP3 locks
+## DP: NOTE: Though this patch enables you to lower POP3 lock timeouts to 
+## DP: less than 10 minutes, the corresponding RFC REQUIRES that the timeout
+## DP: is not shorter than 10 minutes. You may run into problems if you set
+## DP: Timeouts below that value.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c	2005-05-25 00:07:42.000000000 +0200
++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c	2005-07-15 16:53:38.168045663 +0200
+@@ -402,7 +402,7 @@
+ 
+     /* Set inactivity timer */
+     timeout = config_getint(IMAPOPT_POPTIMEOUT);
+-    if (timeout < 10) timeout = 10;
++    if (timeout < 1) timeout = 1;
+     prot_settimeout(popd_in, timeout*60);
+     prot_setflushonread(popd_in, popd_out);
+ 
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions	2005-05-25 00:07:42.000000000 +0200
++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions	2005-07-15 16:57:59.646502208 +0200
+@@ -601,7 +601,9 @@
+ 
+ { "poptimeout", 10, INT }
+ /* Set the length of the POP server's inactivity autologout timer,    
+-   in minutes.  The minimum value is 10, the default. */
++   in minutes.  The minimum value is 1, the default is 10. 
++   NOTE: The standard (RFC1939) specifically states that this
++   value MUST NOT be lower than 10.*/
+ 
+ { "popuseacl", 0, SWITCH }
+ /* Enforce IMAP ACLs in the pop server.  Due to the nature of the POP3
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/61-64bit-quota.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/61-64bit-quota.dpatch
@@ -0,0 +1,669 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-64bit-quota.dpatch by Ondrej Sury <ondrej@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for 64-bit quotas
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2/configure.in /tmp/dpep.9eBPYl/cyrus-imapd-2.2/configure.in
+--- cyrus-imapd-2.2/configure.in	2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/configure.in	2006-03-31 22:23:20.307966043 +0200
+@@ -107,6 +107,15 @@
+ dnl fi
+ AC_C_INLINE
+ 
++dnl Check if `long long int' is available
++AC_CHECK_SIZEOF(long long int)
++AC_CHECK_SIZEOF(unsigned long long int)
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++  AC_DEFINE(HAVE_LONG_LONG_INT,[],[Does the compiler support long long int?])
++  AC_C_BIGENDIAN
++fi
++
+ CMU_C___ATTRIBUTE__
+ CMU_C_FPIC
+ 
+diff -urNad cyrus-imapd-2.2/imap/append.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/append.c
+--- cyrus-imapd-2.2/imap/append.c	2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/append.c	2006-03-31 22:23:20.308965945 +0200
+@@ -140,7 +140,7 @@
+     if (!r) {
+ 	if (m.quota.limit >= 0 && quotacheck >= 0 &&
+ 	    m.quota.used + quotacheck > 
+-	    ((unsigned) m.quota.limit * QUOTA_UNITS)) {
++	    ((uquota_t) m.quota.limit * QUOTA_UNITS)) {
+ 	    r = IMAP_QUOTA_EXCEEDED;
+ 	}
+     }
+@@ -208,7 +208,7 @@
+     if (!r) {
+ 	if (as->m.quota.limit >= 0 && quotacheck >= 0 &&
+ 	    as->m.quota.used + quotacheck > 
+-	    ((unsigned) as->m.quota.limit * QUOTA_UNITS)) {
++	    ((uquota_t) as->m.quota.limit * QUOTA_UNITS)) {
+ 	    quota_abort(&as->tid);
+ 	    mailbox_close(&as->m);
+ 	    r = IMAP_QUOTA_EXCEEDED;
+diff -urNad cyrus-imapd-2.2/imap/imapd.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/imapd.c
+--- cyrus-imapd-2.2/imap/imapd.c	2006-03-31 22:23:12.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/imapd.c	2006-03-31 22:23:20.311965650 +0200
+@@ -2659,10 +2659,10 @@
+  	     */
+  	    int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
+  	    if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
+- 	        (int)((imapd_mailbox->quota.limit * QUOTA_UNITS) -
+-		      imapd_mailbox->quota.used) < (warnsize * QUOTA_UNITS)) {
++ 	        ((uquota_t) (imapd_mailbox->quota.limit - warnsize)) * QUOTA_UNITS < 
++		imapd_mailbox->quota.used) {
+ 		usage = ((double) imapd_mailbox->quota.used * 100.0) / (double)
+-		    (imapd_mailbox->quota.limit * QUOTA_UNITS);
++		    ((uquota_t) imapd_mailbox->quota.limit * QUOTA_UNITS);
+ 		if (usage >= 100.0) {
+ 		    prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
+ 				error_message(IMAP_NO_OVERQUOTA));
+@@ -4660,7 +4660,7 @@
+ 	printastring(name);
+ 	prot_printf(imapd_out, " (");
+ 	if (quota.limit >= 0) {
+-	    prot_printf(imapd_out, "STORAGE %lu %d",
++	    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
+ 			quota.used/QUOTA_UNITS, quota.limit);
+ 	}
+ 	prot_printf(imapd_out, ")\r\n");
+@@ -4722,7 +4722,7 @@
+ 		printastring(mailboxname);
+ 		prot_printf(imapd_out, " (");
+ 		if (mailbox.quota.limit >= 0) {
+-		    prot_printf(imapd_out, "STORAGE %lu %d",
++		    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
+ 				mailbox.quota.used/QUOTA_UNITS,
+ 				mailbox.quota.limit);
+ 		}
+diff -urNad cyrus-imapd-2.2/imap/mailbox.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.c
+--- cyrus-imapd-2.2/imap/mailbox.c	2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.c	2006-03-31 22:23:20.313965453 +0200
+@@ -84,6 +84,7 @@
+ #include "seen.h"
+ #include "util.h"
+ #include "xmalloc.h"
++#include "byteorder64.h"
+ 
+ static int mailbox_doing_reconstruct = 0;
+ #define zeromailbox(m) { memset(&m, 0, sizeof(struct mailbox)); \
+@@ -788,6 +789,13 @@
+     mailbox->last_uid =
+ 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_LAST_UID)));
+ 
++#ifdef HAVE_LONG_LONG_INT
++    if (mailbox->minor_version > 5) {
++	/* newer versions may use 64bit quotas now */
++        mailbox->quota_mailbox_used =
++            ntohll(*((bit64 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED64)));
++    } else
++#endif
+     mailbox->quota_mailbox_used =
+ 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED-quota_upgrade_offset)));
+ 
+@@ -1183,9 +1191,18 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
+-    *((bit32 *)(buf+OFFSET_QUOTA_RESERVED_FIELD)) = htonl(0); /* RESERVED */
++
++    /* quotas may be 64bit now */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(mailbox->quota_mailbox_used);
++#else	
++    /* zero the unused 32bits */
++    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0)
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+ 	htonl(mailbox->quota_mailbox_used);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
+@@ -1430,9 +1447,18 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
+-    /* OFFSET_QUOTA_RESERVED_FIELD left as zero */
++
++    /* newer versions may use 64bit quotas */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(mailbox->quota_mailbox_used);
++#else	
++    /* zero the unused 32bits */
++    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+ 	htonl(mailbox->quota_mailbox_used);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
+@@ -1608,7 +1634,8 @@
+     size_t fnamebuf_len;
+     FILE *newindex = NULL, *newcache = NULL;
+     unsigned long *deleted;
+-    unsigned numdeleted = 0, quotadeleted = 0;
++    unsigned numdeleted = 0;
++    uquota_t quotadeleted = 0;
+     unsigned numansweredflag = 0;
+     unsigned numdeletedflag = 0;
+     unsigned numflaggedflag = 0;
+@@ -1835,8 +1862,13 @@
+     *((bit32 *)(buf+OFFSET_FLAGGED)) = htonl(newflagged);
+ 
+     /* Fix up quota_mailbox_used */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(ntohll(*((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)))-quotadeleted);
++#else
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+       htonl(ntohl(*((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)))-quotadeleted);
++#endif
+     /* Fix up start offset if necessary */
+     if (mailbox->start_offset < INDEX_HEADER_SIZE) {
+ 	*((bit32 *)(buf+OFFSET_START_OFFSET)) = htonl(INDEX_HEADER_SIZE);
+@@ -1868,7 +1900,7 @@
+ 	if (!r) quota_commit(&tid);
+ 	else {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %u bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   quotadeleted, mailbox->quota.root);
+ 	}
+     }
+@@ -2138,7 +2170,7 @@
+ 	r = quota_write(&mailbox->quota, &tid);
+ 	if (r) {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   mailbox->quota_mailbox_used, mailbox->quota.root);
+ 	}
+ 	else
+@@ -2256,7 +2288,7 @@
+ 	    strcmp(oldmailbox->quota.root, newmailbox->quota.root) != 0) {
+ 	    if (!r && newmailbox->quota.limit >= 0 &&
+ 		newmailbox->quota.used + oldmailbox->quota_mailbox_used >
+-		((unsigned) newmailbox->quota.limit * QUOTA_UNITS)) {
++		((uquota_t) newmailbox->quota.limit * QUOTA_UNITS)) {
+ 		r = IMAP_QUOTA_EXCEEDED;
+ 	    }
+ 	}
+@@ -2470,7 +2502,7 @@
+ 	    strcmp(oldmailbox.quota.root, newmailbox.quota.root) != 0) {
+ 	    if (!r && newmailbox.quota.limit >= 0 &&
+ 		newmailbox.quota.used + oldmailbox.quota_mailbox_used >
+-		((unsigned) newmailbox.quota.limit * QUOTA_UNITS)) {
++		((uquota_t) newmailbox.quota.limit * QUOTA_UNITS)) {
+ 		r = IMAP_QUOTA_EXCEEDED;
+ 	    }
+ 	}
+@@ -2623,7 +2655,7 @@
+ 	else if (r2 == IMAP_QUOTAROOT_NONEXISTENT) r2 = 0;
+ 	if (r2) {
+ 	    syslog(LOG_ERR,
+-	      "LOSTQUOTA: unable to record use of %lu bytes in quota %s",
++	      "LOSTQUOTA: unable to record use of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   newmailbox.quota_mailbox_used, newmailbox.quota.root);
+ 	}
+     }
+diff -urNad cyrus-imapd-2.2/imap/mailbox.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.h
+--- cyrus-imapd-2.2/imap/mailbox.h	2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.h	2006-03-31 22:23:20.313965453 +0200
+@@ -45,6 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <limits.h>
++#include <config.h>
+ 
+ #include "auth.h"
+ #include "quota.h"
+@@ -61,6 +62,10 @@
+ #error dont know what to use for bit32
+ #endif
+ 
++#ifdef HAVE_LONG_LONG_INT
++typedef unsigned long long int bit64;
++#endif
++
+ #define MAX_MAILBOX_NAME 490
+ #define MAX_MAILBOX_PATH 4096
+ 
+@@ -126,7 +131,7 @@
+     unsigned long exists;
+     time_t last_appenddate;
+     unsigned long last_uid;
+-    unsigned long quota_mailbox_used;
++    uquota_t quota_mailbox_used;
+     unsigned long pop3_last_login;
+     unsigned long uidvalidity;
+ 
+@@ -168,8 +173,8 @@
+ #define OFFSET_EXISTS 20
+ #define OFFSET_LAST_APPENDDATE 24
+ #define OFFSET_LAST_UID 28
+-#define OFFSET_QUOTA_RESERVED_FIELD 32  /* Reserved for 64bit quotas */
+-#define OFFSET_QUOTA_MAILBOX_USED 36
++#define OFFSET_QUOTA_MAILBOX_USED64 32  /* offset for 64bit quotas */
++#define OFFSET_QUOTA_MAILBOX_USED 36    /* offset for 32bit quotas */
+ #define OFFSET_POP3_LAST_LOGIN 40
+ #define OFFSET_UIDVALIDITY 44
+ #define OFFSET_DELETED 48      /* added for ACAP */
+diff -urNad cyrus-imapd-2.2/imap/mbdump.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbdump.c
+--- cyrus-imapd-2.2/imap/mbdump.c	2006-03-31 22:23:12.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbdump.c	2006-03-31 22:23:20.314965354 +0200
+@@ -507,7 +507,7 @@
+ {
+     struct buf file, data;
+     char c;
+-    int quotaused = 0;
++    uquota_t quotaused = 0;
+     int r = 0;
+     int curfile = -1;
+     const char *userid = NULL;
+diff -urNad cyrus-imapd-2.2/imap/mbexamine.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbexamine.c
+--- cyrus-imapd-2.2/imap/mbexamine.c	2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbexamine.c	2006-03-31 22:23:20.314965354 +0200
+@@ -266,7 +266,7 @@
+     printf("  Minor Version: %d\n", mailbox.minor_version);
+     printf("  Header Size: %ld bytes  Record Size: %ld bytes\n",
+ 	   mailbox.start_offset, mailbox.record_size);
+-    printf("  Number of Messages: %lu  Mailbox Size: %lu bytes\n",
++    printf("  Number of Messages: %lu  Mailbox Size: " UQUOTA_T_FMT " bytes\n",
+ 	   mailbox.exists, mailbox.quota_mailbox_used);
+     printf("  Last Append Date: (%ld) %s", mailbox.last_appenddate,
+ 	   ctime(&mailbox.last_appenddate));
+diff -urNad cyrus-imapd-2.2/imap/mboxlist.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mboxlist.c
+--- cyrus-imapd-2.2/imap/mboxlist.c	2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mboxlist.c	2006-03-31 22:23:20.316965158 +0200
+@@ -2540,7 +2540,7 @@
+ 	r = quota_write(&mailbox.quota, tid);
+ 	if (r) {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   mailbox.quota_mailbox_used, mailbox.quota.root);
+ 	}
+ 	free(mailbox.quota.root);
+diff -urNad cyrus-imapd-2.2/imap/quota.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.c
+--- cyrus-imapd-2.2/imap/quota.c	2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.c	2006-03-31 22:23:20.316965158 +0200
+@@ -107,7 +107,7 @@
+     struct quota quota;
+     int refcount;
+     int deleted;
+-    unsigned long newused;
++    uquota_t newused;
+ };
+ 
+ /* forward declarations */
+@@ -473,7 +473,7 @@
+ 	(*count)++;
+     }
+     if (quota[thisquota].quota.used != quota[thisquota].newused) {
+-	printf("%s: usage was %lu, now %lu\n", quota[thisquota].quota.root,
++	printf("%s: usage was " UQUOTA_T_FMT ", now " UQUOTA_T_FMT "\n", quota[thisquota].quota.root,
+ 	       quota[thisquota].quota.used, quota[thisquota].newused);
+ 	quota[thisquota].quota.used = quota[thisquota].newused;
+ 	r = quota_write(&quota[thisquota].quota, tid);
+@@ -539,12 +539,12 @@
+     int i;
+     char buf[MAX_MAILBOX_PATH+1];
+ 
+-    printf("   Quota  %% Used    Used Root\n");
++    printf("   Quota   %% Used     Used Root\n");
+ 
+     for (i = 0; i < quota_num; i++) {
+ 	if (quota[i].deleted) continue;
+ 	if (quota[i].quota.limit > 0) {
+-	    printf(" %7d %7ld", quota[i].quota.limit,
++	    printf(" %7d " QUOTA_REPORT_FMT , quota[i].quota.limit,
+ 		   ((quota[i].quota.used / QUOTA_UNITS) * 100) / quota[i].quota.limit);
+ 	}
+ 	else if (quota[i].quota.limit == 0) {
+@@ -557,6 +557,6 @@
+ 	(*quota_namespace.mboxname_toexternal)(&quota_namespace,
+ 					       quota[i].quota.root,
+ 					       "cyrus", buf);
+-	printf(" %7ld %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
++	printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
+     }
+ }
+diff -urNad cyrus-imapd-2.2/imap/quota.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.h
+--- cyrus-imapd-2.2/imap/quota.h	2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.h	2006-03-31 22:23:20.317965059 +0200
+@@ -45,18 +45,37 @@
+ #define INCLUDED_QUOTA_H
+ 
+ #include "cyrusdb.h"
++#include <config.h>
+ 
+ #define FNAME_QUOTADB "/quotas.db"
+ 
+ #define QUOTA_UNITS (1024)
+ 
++/* Define the proper quota type, it should either be a
++ * long or a long long int depending upon what the
++ * the compiler supports.
++ */
++#ifdef HAVE_LONG_LONG_INT
++typedef unsigned long long int uquota_t;
++typedef long long int quota_t;
++#define UQUOTA_T_FMT     "%llu"
++#define QUOTA_T_FMT      "%lld"
++#define QUOTA_REPORT_FMT "%8llu"
++#else
++typedef unsigned long uquota_t;
++typedef long quota_t;
++#define UQUOTA_T_FMT     "%lu"
++#define QUOTA_T_FMT      "%ld"
++#define QUOTA_REPORT_FMT "%8lu"
++#endif
++
+ extern struct db *qdb;
+ 
+ struct quota {
+     char *root;
+ 
+     /* Information in quota entry */
+-    unsigned long used;
++    uquota_t used;
+     int limit;			/* in QUOTA_UNITS */
+ };
+ 
+diff -urNad cyrus-imapd-2.2/imap/quota_db.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota_db.c
+--- cyrus-imapd-2.2/imap/quota_db.c	2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota_db.c	2006-03-31 22:23:20.317965059 +0200
+@@ -89,7 +89,7 @@
+ 
+     switch (r) {
+     case CYRUSDB_OK:
+-	sscanf(data, "%lu %d", &quota->used, &quota->limit);
++	sscanf(data, UQUOTA_T_FMT " %d", &quota->used, &quota->limit);
+ 	break;
+ 
+     case CYRUSDB_AGAIN:
+@@ -151,7 +151,7 @@
+     if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
+ 
+     len = snprintf(buf, sizeof(buf) - 1,
+-		   "%lu %d", quota->used, quota->limit);
++		   UQUOTA_T_FMT " %d", quota->used, quota->limit);
+     r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
+     
+     switch (r) {
+diff -urNad cyrus-imapd-2.2/imap/reconstruct.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/reconstruct.c
+--- cyrus-imapd-2.2/imap/reconstruct.c	2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/reconstruct.c	2006-03-31 22:23:20.318964961 +0200
+@@ -93,6 +93,7 @@
+ #include "retry.h"
+ #include "convert_code.h"
+ #include "util.h"
++#include "byteorder64.h"
+ 
+ extern int optind;
+ extern char *optarg;
+@@ -434,7 +435,7 @@
+     char *list_acl, *list_part;
+     int list_type;
+ 
+-    unsigned long new_quota = 0;
++    uquota_t new_quota = 0;
+ 
+     struct index_record message_index, old_index;
+     static struct index_record zero_index;
+@@ -690,7 +691,14 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(new_exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox.last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox.last_uid);
+-    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
++
++    /* quotas may be 64bit now */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(new_quota);
++#else
++    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED32)) = htonl(new_quota);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox.uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(new_deleted);
+diff -urNad cyrus-imapd-2.2/lib/Makefile.in /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/Makefile.in
+--- cyrus-imapd-2.2/lib/Makefile.in	2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/Makefile.in	2006-03-31 22:23:20.318964961 +0200
+@@ -85,7 +85,7 @@
+ 	$(srcdir)/lsort.h $(srcdir)/stristr.h \
+ 	$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
+ 	$(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
+-	$(srcdir)/libcyr_cfg.h
++	$(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
+ 
+ LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
+ 	libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
+@@ -93,7 +93,7 @@
+ 	chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
+ 	gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
+ 	@LIBOBJS@ @CYRUSDB_OBJS@ \
+-	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o
++	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o byteorder64.o
+ 
+ LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h \
+ 	$(srcdir)/strhash.o $(srcdir)/libconfig.h \
+diff -urNad cyrus-imapd-2.2/lib/byteorder64.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.c
+--- cyrus-imapd-2.2/lib/byteorder64.c	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.c	2006-03-31 22:23:20.318964961 +0200
+@@ -0,0 +1,95 @@
++/* byteorder64.c -- convert 64-bit values between host and network byte order
++ * 
++ * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * $Id: byteorder64.c,v 1.1.2.1 2004/08/09 18:51:21 ken3 Exp $
++ */
++
++#include <config.h>
++
++#if defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN)
++
++#include <netinet/in.h>
++
++/* Structure used to swap the bytes in a 64-bit unsigned long long. */
++union byteswap_64_u {
++    unsigned long long a;
++    uint32_t b[2];
++};
++
++/* Function to byteswap 64bit unsigned integers on
++ * little endian machines to big endian network order. 
++ * On big endian machines this will be a null macro.
++ * The macro htonll() is defined in byteorder64.h,
++ * and if needed refers to _htonll() here.
++ */
++unsigned long long _htonll(unsigned long long x)
++{
++    union byteswap_64_u u1;
++    union byteswap_64_u u2;
++
++    u1.a = x;
++
++    u2.b[0] = htonl(u1.b[1]);
++    u2.b[1] = htonl(u1.b[0]);
++
++    return u2.a;
++}
++
++
++/* Function to byteswap big endian 64bit unsigned integers
++ * back to little endian host order on little endian machines. 
++ * As above, on big endian machines this will be a null macro.
++ * The macro ntohll() is defined in byteorder64.h, and if needed,
++ * refers to _ntohll() here.
++ */
++unsigned long long _ntohll(unsigned long long x)
++{
++    union byteswap_64_u u1;
++    union byteswap_64_u u2;
++
++    u1.a = x;
++
++    u2.b[1] = ntohl(u1.b[0]);
++    u2.b[0] = ntohl(u1.b[1]);
++
++    return u2.a;
++}
++
++#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
+diff -urNad cyrus-imapd-2.2/lib/byteorder64.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.h
+--- cyrus-imapd-2.2/lib/byteorder64.h	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.h	2006-03-31 22:23:20.319964862 +0200
+@@ -0,0 +1,65 @@
++/* byteorder64.h -- convert 64-bit values between host and network byte order
++ *
++ * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * $Id: byteorder64.h,v 1.1.2.2 2004/08/16 11:44:34 ken3 Exp $
++ */
++
++#ifndef _BYTEORDER64_H
++#define _BYTEORDER64_H
++
++#include <config.h>
++
++#ifdef HAVE_LONG_LONG_INT
++
++/* 64-bit host/network byte-order swap macros */
++#ifdef WORDS_BIGENDIAN
++#define htonll(x) (x)
++#define ntohll(x) (x)
++#else
++#define htonll(x) _htonll(x)
++#define ntohll(x) _ntohll(x)
++
++/* little-endian 64-bit host/network byte-order swap functions */
++extern unsigned long long _htonll(unsigned long long);
++extern unsigned long long _ntohll(unsigned long long);
++
++#endif /* WORDS_BIGENDIAN */
++#endif /* HAVE_LONG_LONG_INT */
++#endif /* _BYTEORDER64_H */
+diff -urNad cyrus-imapd-2.2/lib/prot.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/prot.c
+--- cyrus-imapd-2.2/lib/prot.c	2006-03-31 18:52:04.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/prot.c	2006-03-31 22:23:20.319964862 +0200
+@@ -871,6 +871,11 @@
+     char buf[30];
+     va_start(pvar, fmt);
+ 
++#ifdef HAVE_LONG_LONG_INT
++    long long int ll;
++    unsigned long long int ull;
++#endif
++
+     assert(s->write);
+ 
+     while ((percent = strchr(fmt, '%')) != 0) {
+@@ -894,6 +899,27 @@
+ 		prot_write(s, buf, strlen(buf));
+ 		break;
+ 
++#ifdef HAVE_LONG_LONG_INT
++            case 'l':
++	        switch (*++percent) {
++		case 'd':
++		    ll = va_arg(pvar, long long int);
++		    snprintf(buf, sizeof(buf), "%lld", ll);
++		    prot_write(s, buf, strlen(buf));
++		    break;
++
++		case 'u':
++		    ull = va_arg(pvar, unsigned long long int);
++		    snprintf(buf, sizeof(buf), "%llu", ull);
++		    prot_write(s, buf, strlen(buf));
++		    break;
++
++	        default:
++		    abort();
++		}
++		break;
++#endif
++
+ 	    default:
+ 		abort();
+ 	    }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/65-sieveshell-enhancements.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch
@@ -0,0 +1,258 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65-sieveshell-enhancements.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds some enhancements to sieveshell and fixes some paths.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:24:55.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:26:19.796548250 +0200
+@@ -126,7 +126,7 @@
+ 		  [\&_sc_info, '[mailbox]',
+ 		   'display mailbox/server metadata'],
+ 		mboxcfg =>
+-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value',
++		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
+ 		   'configure mailbox'],
+ 		mboxconfig => 'mboxcfg',
+ 		reconstruct =>
+@@ -437,7 +437,7 @@
+ # programs, as opposed to things expected from within a program.)
+ sub shell {
+   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
+-    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
++    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
+      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
+   GetOptions('user|u=s' => \$auth,
+ 	     'authz|z=s' => \$authz,
+@@ -467,7 +467,7 @@
+ 			  -rock => \$cyradm});
+     $cyradm->authenticate(-authz => $authz, -user => $auth,
+ 			  -mechanism => $mech, -password => $pw)
+-      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
++      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
+   }
+   my $fstk = [*STDIN, *STDOUT, *STDERR];
+   if ($dorc && $systemrc ne '' && -f $systemrc) {
+@@ -1400,7 +1400,7 @@
+   while (defined ($opt = shift(@argv))) {
+     last if $opt eq '--';
+     if ($opt =~ /^-/) {
+-      die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
++      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+     }
+     else {
+       push(@nargv, $opt);
+@@ -1409,7 +1409,7 @@
+   }
+   push(@nargv, @argv);
+   if (@nargv < 2) {
+-    die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
++    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+   }
+   if (!$cyrref || !$$cyrref) {
+     die "mboxconfig: no connection to server\n";
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:24:55.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:25:11.549208277 +0200
+@@ -560,7 +560,6 @@
+ 	      char **refer_to, char **errstrp)
+ {
+   int res;
+-  mystring_t *str=NULL;
+   mystring_t *errstr=NULL;
+   lexstate_t state;
+   int ret = 0;
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:07.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:11.550208179 +0200
+@@ -60,7 +60,9 @@
+ my $username = $ENV{USER};
+ my $authname = $ENV{USER};
+ my $realm = "";
++my $password;
+ my $ex = "";
++my $exfile = "";
+ my $help = 0;
+ my $man = 0;
+ my $ret;
+@@ -68,7 +70,9 @@
+ GetOptions("a|authname:s" => \$authname,
+     "u|username:s" => \$username,
+     "r|realm:s" => \$realm,
++    "p|password:s" => \$password,
+     "e|exec:s" => \$ex,
++    "f|execfile:s" => \$exfile,
+     "help|?" => \$help,
+     man => \$man) or pod2usage(2);
+ pod2usage(1) if $help;
+@@ -83,20 +87,24 @@
+ my $filehandle;
+ my $interactive;
+ 
+-if (! $ex eq "") {
+-    $filehandle = tempfile();
+-
+-    if (!$filehandle) { die "unable to open tmp file: $?"; }
+-
+-    print $filehandle $ex;
+-    seek $filehandle, 0, 0; # rewind file
++if (! $exfile eq "") {
++    open(FILEH,"<$exfile") || die "unable to open file: $?";
++    $filehandle = *FILEH;
+     $interactive = 0;
+ } else {
+-    $filehandle = *STDIN;
+-    $interactive = 1;
+-}
++    if (! $ex eq "") {
++	$filehandle = tempfile();
+ 
++	if (!$filehandle) { die "unable to open tmp file: $?"; }
+ 
++	print $filehandle $ex;
++	seek $filehandle, 0, 0; # rewind file
++	$interactive = 0;
++    } else {
++	$filehandle = *STDIN;
++	$interactive = 1;
++    }
++}
+ 
+ sub list_cb {
+ 
+@@ -121,6 +129,8 @@
+       return $authname;
+   } elsif (($type eq "realm") && (defined $realm)) {
+       return $realm;
++  } elsif (($type eq "password") && (defined $password)) {
++      return $password;
+   }
+ 
+   my $ostty;
+@@ -171,6 +181,8 @@
+ 
+ my $term = Term::ReadLine->new("sieveshell");
+ 
++my $exitcode = 0;
++
+ $term->ornaments(0);
+ 
+ while(defined($_  = ($interactive ? $term->readline('> ') : <$filehandle>))){
+@@ -197,6 +209,9 @@
+ 	my $errstr = sieve_get_error($obj);
+ 	$errstr = "unknown error" if(!defined($errstr));
+ 	print "upload failed: $errstr\n"; 
++	$exitcode = 1;
++      } else {
++        $exitcode = 0;
+       }
+     } elsif (($words[0] eq "list") || 
+ 	     ($words[0] eq "l") || 
+@@ -206,6 +221,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "list failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "activate") || 
+ 	     ($words[0] eq "a")) {
+@@ -218,6 +236,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "activate failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "deactivate") || 
+ 	     ($words[0] eq "da")) {
+@@ -230,6 +251,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "deactivate failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "delete") || 
+ 	     ($words[0] eq "d")) {    
+@@ -242,6 +266,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "delete failed: $errstr\n"; 
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "get") || 
+ 	     ($words[0] eq "g")) {
+@@ -255,25 +282,32 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "get failed: $errstr\n"; 
++	    $exitcode = 1;
+ 	} else {
+ 	    if ($words[2]) {
+ 		open (OUTPUT,">$words[2]") || die "Unable to open $words[2]";
+ 		print OUTPUT $str;
+ 		close(OUTPUT);
++		$exitcode = 0;
+ 	    } else {
+ 		print $str;
++		$exitcode = 0;
+ 	    }
+ 	}
+     } elsif (($words[0] eq "quit") || ($words[0] eq "q")) {
+         sieve_logout($obj);
+-	exit 0;
++	exit $exitcode;
+     } elsif (($words[0] eq "help") || ($words[0] eq "?")) {
+ 	show_help();
++	$exitcode = 0;
+     } else {
+ 	print "Invalid command: $words[0]\n";
++	$exitcode = 1;
+     } 
+ }
+ 
++exit $exitcode;
++
+ __END__
+ 
+ =head1 NAME
+@@ -283,7 +317,8 @@
+ =head1 SYNOPSIS
+ 
+ sieveshell [B<--user>=I<user>] [B<--authname>=I<authname>] 
+-[B<--realm>=I<realm>] [B<--exec>=I<script>] I<server>[B<:>I<port>]
++[B<--realm>=I<realm>] [B<--password>=I<password>]
++[B<--exec>=I<script>] [B<--execfile>=I<file>] I<server>[B<:>I<port>]
+ 
+ sieveshell B<--help>
+ 
+@@ -327,11 +362,21 @@
+ 
+ The realm to attempt authentication in.
+ 
++=item B<-p> I<password>, B<--password>=I<password>
++
++The password to use when authenticating to server. Note that this
++parameter can be seen in the process list. B<Use with caution!>
++
+ =item B<-e> I<script>, B<--exec>=I<script> 
+ 
+ Instead of working interactively, run commands from I<script>, and
+ exit when done.
+ 
++=item B<-f> I<file>, B<--execfile>=I<file>
++
++Instead of working interactively, run commands from file I<file> and
++exit when done.
++
+ =back
+ 
+ =head1 REFERENCES
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-allow-larger-buffers.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/70-allow-larger-buffers.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## allow-larger-buffers-dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to allow larger buffers (especially for list of UIDs).
+## DP: Patch taken and "backported" to 2.2 from:
+## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-longwords-2.3.3.diff
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c
+--- cyrus-imapd-2.2.13/imap/imapparse.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c	2006-05-24 14:33:42.733793569 +0200
+@@ -52,8 +52,8 @@
+ #include "exitcodes.h"
+ 
+ enum {
+-    MAXQUOTED = 32768,
+-    MAXWORD = 32768,
++    MAXQUOTED = 131072,
++    MAXWORD = 131072,
+     MAXLITERAL = INT_MAX / 20
+ };
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-fix_readme_link.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/70-fix_readme_link.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-fix_readme_link.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bad link in readme.html
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/doc/readme.html cyrus-imapd-2.2.13/doc/readme.html
+--- cyrus-imapd-2.2.13~/doc/readme.html	2006-05-05 21:04:27.000000000 -0400
++++ cyrus-imapd-2.2.13/doc/readme.html	2006-05-24 16:18:45.000000000 -0400
+@@ -56,7 +56,7 @@
+ <P> This system should be expected to have the same order-of-magnitude
+ installation complexity as a netnews system.  Maintenance should have
+ similar complexity, except administrators will have to deal with <A
+-HREF="cyradm.1.html">creation and deletion of users</A> and will have
++HREF="man/cyradm.1.html">creation and deletion of users</A> and will have
+ the option of managing quotas and access control lists.
+ 
+ <p>This package is distributed as a source only release. It is
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/72-faster-isdigit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/72-faster-isdigit.dpatch
@@ -0,0 +1,145 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 72-faster-isdigit.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use a smaller (but less intelligent) isdigit() implementation,
+## DP: a simple range-check. Patch backported from:
+## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-isdigit-2.3.3.diff
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/index.c /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/imap/index.c
+--- cyrus-imapd-2.2.13/imap/index.c	2006-05-24 14:47:49.000000000 +0200
++++ /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/imap/index.c	2006-05-24 14:49:15.509369880 +0200
+@@ -490,8 +490,8 @@
+      */
+     old = seenuids;
+     new = newseenuids;
+-    while (isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
+-    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++    while (cyrus_isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
++    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 
+     for (msgno = 1; msgno <= imapd_exists; msgno++) {
+ 	uid = UID(msgno);
+@@ -505,7 +505,7 @@
+ 		oldnext = 0;
+ 		if (!*old) oldnext = mailbox->last_uid+1;
+ 		else old++;
+-		while (isdigit((int) *old)) {
++		while (cyrus_isdigit((int) *old)) {
+ 		    oldnext = oldnext * 10 + *old++ - '0';
+ 		}
+ 		oldnext += oldseen;
+@@ -524,7 +524,7 @@
+ 		    neweof++;
+ 		}
+ 		else new++;
+-		while (isdigit((int) *new)) {
++		while (cyrus_isdigit((int) *new)) {
+ 		    newnext = newnext * 10 + *new++ - '0';
+ 		}
+ 		newnext += newseen;
+@@ -643,7 +643,7 @@
+ 		neweof++;
+ 	    }
+ 	    else new++;
+-	    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++	    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 	    newnext += newseen;
+ 	}
+     }
+@@ -661,7 +661,7 @@
+ 		/* There's a ":M" after the ",N".  Parse/include that too. */
+ 		new++;
+ 		newnext = 0;
+-		while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++		while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 	    }
+ 	    uid = newnext;
+ 	    newseen++;		/* Forget we parsed ",N" */
+@@ -1504,7 +1504,7 @@
+     }
+ 
+     for (;;) {
+-	if (isdigit((int) *sequence)) {
++	if (cyrus_isdigit((int) *sequence)) {
+ 	    start = start*10 + *sequence - '0';
+ 	}
+ 	else if (*sequence == '*') {
+@@ -1513,7 +1513,7 @@
+ 	else if (*sequence == ':') {
+ 	    end = 0;
+ 	    sequence++;
+-	    while (isdigit((int) *sequence)) {
++	    while (cyrus_isdigit((int) *sequence)) {
+ 		end = end*10 + *sequence++ - '0';
+ 	    }
+ 	    if (*sequence == '*') {
+@@ -1571,7 +1571,7 @@
+     unsigned i, start = 0, end;
+ 
+     for (;;) {
+-	if (isdigit((int) *sequence)) {
++	if (cyrus_isdigit((int) *sequence)) {
+ 	    start = start*10 + *sequence - '0';
+ 	}
+ 	else if (*sequence == '*') {
+@@ -1581,7 +1581,7 @@
+ 	else if (*sequence == ':') {
+ 	    end = 0;
+ 	    sequence++;
+-	    while (isdigit((int) *sequence)) {
++	    while (cyrus_isdigit((int) *sequence)) {
+ 		end = end*10 + *sequence++ - '0';
+ 	    }
+ 	    if (*sequence == '*') {
+@@ -1705,7 +1705,7 @@
+     while (*p != ']' && *p != 'M') {
+ 	/* Generate the actual part number */
+ 	skip = 0;
+-	while (isdigit((int) *p)) {
++	while (cyrus_isdigit((int) *p)) {
+             skip = skip * 10 + *p++ - '0';
+             /* xxx overflow */
+         }
+@@ -1834,7 +1834,7 @@
+ 
+     while (*p != 'H') {
+ 	skip = 0;
+-	while (isdigit((int) *p)) {
++	while (cyrus_isdigit((int) *p)) {
+             skip = skip * 10 + *p++ - '0';
+             /* xxx overflow */
+         }
+@@ -3378,7 +3378,7 @@
+ 	case '{':			/* literal */
+ 	    c++;			/* skip open brace */
+ 	    len = 0;			/* determine length of literal */
+-	    while (isdigit((int) *c)) {
++	    while (cyrus_isdigit((int) *c)) {
+ 		len = len*10 + *c - '0';
+ 		c++;
+ 	    }
+@@ -3532,7 +3532,7 @@
+ 			break;
+ 		    			/* if we have a digit, and we're still
+ 					   counting, keep building the count */
+-		    } else if (isdigit((int) *x) && count != -1) {
++		    } else if (cyrus_isdigit((int) *x) && count != -1) {
+ 			count = count * 10 + *x - '0';
+                         if (count < 0) {                /* overflow */
+                             count = -1; /* abort counting */
+diff -urNad cyrus-imapd-2.2.13/lib/util.h /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/lib/util.h
+--- cyrus-imapd-2.2.13/lib/util.h	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/lib/util.h	2006-05-24 14:48:36.634022360 +0200
+@@ -107,4 +107,10 @@
+  */
+ extern int cyrus_mkdir(const char *path, mode_t mode);
+ 
++/* Some systems have very inefficient implementations of isdigit,
++ * and we use it in a lot of inner loops
++ */
++
++#define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
++
+ #endif /* INCLUDED_UTIL_H */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/99-update-autoconf.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/99-update-autoconf.dpatch
@@ -0,0 +1,47863 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-update-autoconf.dpatch by Ondrej Sury <ondrej@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update configure and config.h.in according to changes in other patches
+## DP: (64bit-quota and potentially DRAC)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/aclocal.m4 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4
+--- cyrus-imapd-2.2.13/aclocal.m4	2006-04-22 15:13:25.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4	2006-05-19 15:21:21.043759469 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005  Free Software Foundation, Inc.
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0
+--- cyrus-imapd-2.2.13/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0	2006-05-19 15:21:21.104753736 +0200
+@@ -0,0 +1,18639 @@
++@%:@! /bin/sh
++@%:@ Guess values for system-dependent variables and create Makefiles.
++@%:@ Generated by GNU Autoconf 2.59.
++@%:@ 
++@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
++@%:@ This configure script is free software; the Free Software Foundation
++@%:@ gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# 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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="imap/imapd.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR 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 LIB@&t@OBJS 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 WITH_IDLE 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 CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_files=''
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++ac_prev=
++for ac_option
++do
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case $ac_option in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir=$ac_optarg ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build_alias ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build_alias=$ac_optarg ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir=$ac_optarg ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_$ac_feature='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix=$ac_optarg ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host_alias ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host_alias=$ac_optarg ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir=$ac_optarg ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir=$ac_optarg ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir=$ac_optarg ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir=$ac_optarg ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir=$ac_optarg ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir=$ac_optarg ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c | -n)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir=$ac_optarg ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix=$ac_optarg ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix=$ac_optarg ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix=$ac_optarg ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name=$ac_optarg ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir=$ac_optarg ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir=$ac_optarg ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site=$ac_optarg ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir=$ac_optarg ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir=$ac_optarg ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target_alias ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target_alias=$ac_optarg ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
++
++  -with-* | --with-*)
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_$ac_package='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes=$ac_optarg ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries=$ac_optarg ;;
++
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
++    ;;
++
++  *=*)
++    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
++  *)
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used." >&2
++  elif test "x$build_alias" != "x$host_alias"; then
++    cross_compiling=yes
++  fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$0" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
++  else
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++  fi
++fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++for instance \`--prefix=\$HOME'.
++
++For better control, use the options below.
++
++Fine tuning of the installation directories:
++  --bindir=DIR           user executables [EPREFIX/bin]
++  --sbindir=DIR          system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR       program executables [EPREFIX/libexec]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
++  --libdir=DIR           object code libraries [EPREFIX/lib]
++  --includedir=DIR       C header files [PREFIX/include]
++  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++
++System types:
++  --build=BUILD     configure for building on BUILD [guessed]
++  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-warnings-are-errors   add -Werror to most gcc calls
++  --disable-sieve         disable Sieve support
++  --enable-krb5afspts     compile afskrb PTS module with krb5 support
++  --disable-server        disable compiling servers
++  --enable-statickrb      link Kerberos statically
++  --enable-nntp           enable NNTP support (experimental)
++  --enable-murder         enable IMAP Murder support
++  --enable-cmulocal       enable CMU-specific local support
++  --enable-oldsievename   enable the use of 'imap' as the sieve service name
++  --enable-listext        enable IMAP List extensions
++  --enable-netscapehack   enable Netscape hack for the menu option
++                          in Communicator to Administrate Mail
++  --enable-gssapi=<DIR>   enable GSSAPI authentication [yes]
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-extraident=STRING   use STRING as extra version information
++
++  --with-cyrus-prefix=DIR    use DIR as cyrus server install directory
++  --with-service-path=DIR    use DIR as service install directory
++  --with-cyrus-user=USERID   use USERID cyrus userid
++  --with-cyrus-group=GROUPID use GROUPID cyrus group
++  --with-bdb=DIR          use Berkeley DB (in DIR) [yes] 
++  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR
++  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR
++  --with-lock=METHOD      force use of METHOD for locking (flock or fcntl)
++  --with-afs=PATH         use AFS libraries from PATH
++  --with-ldap=DIR         use LDAP (in DIR) (experimental) /usr/local 
++  --with-krb=PATH         use Kerberos from PATH
++  --with-krbimpl=\kth|mit\         assume Kerberos 4 from KTH or MIT
++  --with-krbdes           use Kerberos DES implementation [yes]
++  --with-openssl=PATH     use OpenSSL from PATH
++  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
++                          for systems without /dev/urandom
++  --with-zephyr=PATH    enable Zephyr notification (installed on PATH)
++  --with-pidfile=PATH   pidfile in PATH (/var/run/cyrus-master.pid)
++  --with-idle=METHOD      use METHOD for IMAP IDLE
++                          METHOD is poll, idled or no
++  --with-com_err=PATH     use com_err from path -- includes in PATH/include,
++                          libs in PATH/lib, and compile_et in PATH/bin
++  --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
++  --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
++                          choose specific GSSAPI implementation [[auto]]
++  --with-sasl=DIR         Compile with libsasl2 in <DIR>
++  --with-staticsasl=DIR   Compile with staticly linked libsasl2 in <DIR>
++  --with-perl=PERL        use PERL for perl
++  --with-lib-subdir=DIR   Find libraries in DIR instead of lib
++  --with-libwrap=DIR      use libwrap (rooted in DIR) yes 
++  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) yes 
++
++Some influential environment variables:
++  CC          C compiler command
++  CFLAGS      C compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd "$ac_popdir"
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++@%:@@%:@ --------- @%:@@%:@
++@%:@@%:@ Platform. @%:@@%:@
++@%:@@%:@ --------- @%:@@%:@
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ Core tests. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ---------------- @%:@@%:@
++@%:@@%:@ Cache variables. @%:@@%:@
++@%:@@%:@ ---------------- @%:@@%:@
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ----------------- @%:@@%:@
++@%:@@%:@ Output variables. @%:@@%:@
++@%:@@%:@ ----------------- @%:@@%:@
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++@%:@@%:@ ------------- @%:@@%:@
++@%:@@%:@ Output files. @%:@@%:@
++@%:@@%:@ ------------- @%:@@%:@
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ confdefs.h. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
++    sed 's/^/| /' "$ac_site_file" >&5
++    . "$ac_site_file"
++  fi
++done
++
++if test -r "$cache_file"; then
++  # Some versions of bash will fail to source /dev/null (special
++  # files actually), so we avoid doing that.
++  if test -f "$cache_file"; then
++    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
++    case $cache_file in
++      [\\/]* | ?:[\\/]* ) . $cache_file;;
++      *)                      . ./$cache_file;;
++    esac
++  fi
++else
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++  >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,set)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
++echo "$as_me:   former value:  $ac_old_val" >&2;}
++	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
++echo "$as_me:   current value: $ac_new_val" >&2;}
++	ac_cache_corrupted=:
++      fi;;
++  esac
++  # Pass precious variables to config.status.
++  if test "$ac_new_set" = set; then
++    case $ac_new_val in
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++          ac_config_headers="$ac_config_headers config.h"
++
++ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
++echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++   { (exit 1); exit 1; }; }
++
++echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++   { (exit 1); exit 1; }; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++
++WARNERROR=-W
++# Check whether --enable-warnings-are-errors or --disable-warnings-are-errors was given.
++if test "${enable_warnings_are_errors+set}" = set; then
++  enableval="$enable_warnings_are_errors"
++   if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi 
++fi; 
++
++
++
++# Check whether --with-extraident or --without-extraident was given.
++if test "${with_extraident+set}" = set; then
++  withval="$with_extraident"
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define EXTRA_IDENT "$withval"
++_ACEOF
++
++fi; 
++
++# Extract the first word of "makedepend", so it can be a program name with args.
++set dummy makedepend; 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_MAKEDEPEND+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$MAKEDEPEND"; then
++  ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # 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_MAKEDEPEND="makedepend"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
++fi
++fi
++MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
++if test -n "$MAKEDEPEND"; then
++  echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
++echo "${ECHO_T}$MAKEDEPEND" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test "$MAKEDEPEND" != "makedepend"; then
++        { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
++echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
++fi
++
++
++# Check whether --with-login or --without-login was given.
++if test "${with_login+set}" = set; then
++  withval="$with_login"
++  { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
++Configure SASL appropriately instead." >&5
++echo "$as_me: error: --with-login is no longer supported.
++Configure SASL appropriately instead." >&2;}
++   { (exit 1); exit 1; }; }
++fi; 
++
++
++# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given.
++if test "${with_cyrus_prefix+set}" = set; then
++  withval="$with_cyrus_prefix"
++  cyrus_prefix="$withval"
++else
++  cyrus_prefix="/usr/cyrus"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define CYRUS_PATH "$cyrus_prefix"
++_ACEOF
++
++
++# Check whether --with-service-path or --without-service-path was given.
++if test "${with_service_path+set}" = set; then
++  withval="$with_service_path"
++  service_path="$withval"
++else
++  service_path="$cyrus_prefix/bin"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SERVICE_PATH "$service_path"
++_ACEOF
++
++
++# Check whether --with-cyrus-user or --without-cyrus-user was given.
++if test "${with_cyrus_user+set}" = set; then
++  withval="$with_cyrus_user"
++  cyrus_user="$withval"
++else
++  cyrus_user="cyrus"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define CYRUS_USER "$cyrus_user"
++_ACEOF
++
++
++# Check whether --with-cyrus-group or --without-cyrus-group was given.
++if test "${with_cyrus_group+set}" = set; then
++  withval="$with_cyrus_group"
++  cyrus_group="$withval"
++else
++  cyrus_group="mail"
++fi; 
++
++
++if test $sysconfdir = '${prefix}/etc'; then
++  sysconfdir="/etc"
++fi
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SYSCONFDIR "$sysconfdir"
++_ACEOF
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++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
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $@%:@ != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++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_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  fi
++fi
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cc_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++@%:@ifndef __cplusplus
++  choke me
++@%:@endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; 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_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
++    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_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++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_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftest.make
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++# 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:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# OS/2's system install, which has a completely different semantic
++# ./install, which can be erroneously created by make from ./install.sh.
++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++  ./ | .// | /cC/* | \
++  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  /usr/ucb/* ) ;;
++  *)
++    # OSF1 and SCO ODT 3.0 have their own names for install.
++    # Don't use installbsd from OSF since it installs stuff as root
++    # by default.
++    for ac_prog in ginstall scoinst install; do
++      for ac_exec_ext in '' $ac_executable_extensions; do
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
++      done
++    done
++    ;;
++esac
++done
++
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++  
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++ 
++
++
++echo "$as_me:$LINENO: checking for AIX" >&5
++echo $ECHO_N "checking for AIX... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef _AIX
++  yes
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++cat >>confdefs.h <<\_ACEOF
++@%:@define _ALL_SOURCE 1
++_ACEOF
++
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++rm -f conftest*
++
++
++
++        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
++echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
++if test "${ac_cv_lib_cposix_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcposix  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_cposix_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_cposix_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
++if test $ac_cv_lib_cposix_strerror = yes; then
++  LIBS="$LIBS -lcposix"
++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 for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6
++if test $ac_cv_header_stdc = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6
++if test "${ac_cv_type_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long long int *) 0)
++  return 0;
++if (sizeof (long long int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of long long int" >&5
++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long_long_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long long int)); }
++unsigned long ulongval () { return (long) (sizeof (long long int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long long int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for unsigned long long int" >&5
++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((unsigned long long int *) 0)
++  return 0;
++if (sizeof (unsigned long long int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_unsigned_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_unsigned_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of unsigned long long int" >&5
++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (unsigned long long int)); }
++unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (unsigned long long int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (unsigned long long int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (unsigned long long int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_unsigned_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++_ACEOF
++
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LONG_LONG_INT 
++_ACEOF
++
++  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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic (); 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++int
++main ()
++{
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++  yes)
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++fi
++
++
++echo "$as_me:$LINENO: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
++if test "${ac_cv___attribute__+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv___attribute__=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv___attribute__=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++if test "$ac_cv___attribute__" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++
++echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
++echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
++if test "${ac_cv_fpic+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++save_CFLAGS=$CFLAGS
++CFLAGS="${CFLAGS} -fPIC"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_fpic=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_fpic=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_CFLAGS
++
++fi
++
++if test "$ac_cv_fpic" = "yes"; then
++    FPIC_CFLAGS="-fPIC"
++else
++    FPIC_CFLAGS=""
++fi
++echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
++echo "${ECHO_T}$ac_cv_fpic" >&6
++
++
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++
++
++   # CMU GUESS RUNPATH SWITCH
++    andrew_runpath_switch="none"
++
++
++
++
++
++
++for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++
++
++for ac_func in memmove strcasecmp ftruncate strerror
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++else
++  case $LIB@&t@OBJS in
++    "$ac_func.$ac_objext"   | \
++  *" $ac_func.$ac_objext"   | \
++    "$ac_func.$ac_objext "* | \
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS $ac_func.$ac_objext" ;;
++esac
++
++fi
++done
++
++
++
++
++for ac_func in strlcat strlcpy
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++
++
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_hdr>
++
++int
++main ()
++{
++if ((DIR *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++_ACEOF
++
++ac_header_dirent=$ac_hdr; break
++fi
++
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in dir; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++  
++fi
++
++else
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in x; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++  
++fi
++
++fi
++
++
++
++	save_LIBS="$LIBS"
++	LIB_SOCKET=""
++	echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6
++if test "${ac_cv_func_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define connect to an innocuous variant, in case <limits.h> declares connect.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define connect innocuous_connect
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char connect (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef connect
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_connect) || defined (__stub___connect)
++choke me
++#else
++char (*f) () = connect;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != connect;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6
++if test $ac_cv_func_connect = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostbyname ();
++int
++main ()
++{
++gethostbyname ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_nsl_gethostbyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
++  LIB_SOCKET="-lnsl $LIB_SOCKET"
++fi
++
++		echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++int
++main ()
++{
++connect ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++if test $ac_cv_lib_socket_connect = yes; then
++  LIB_SOCKET="-lsocket $LIB_SOCKET"
++fi
++
++	
++fi
++
++	LIBS="$LIB_SOCKET $save_LIBS"
++	echo "$as_me:$LINENO: checking for res_search" >&5
++echo $ECHO_N "checking for res_search... $ECHO_C" >&6
++if test "${ac_cv_func_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define res_search to an innocuous variant, in case <limits.h> declares res_search.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define res_search innocuous_res_search
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char res_search (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef res_search
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_res_search) || defined (__stub___res_search)
++choke me
++#else
++char (*f) () = res_search;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != res_search;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
++echo "${ECHO_T}$ac_cv_func_res_search" >&6
++if test $ac_cv_func_res_search = yes; then
++  :
++else
++  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#endif
++#include <resolv.h>
++int
++main ()
++{
++
++const char host[12]="openafs.org";
++u_char ans[1024];
++res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
++return 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  LIB_SOCKET="-lresolv $LIB_SOCKET"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        
++fi
++
++	LIBS="$LIB_SOCKET $save_LIBS"
++	
++
++for ac_func in dn_expand dns_lookup
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++	LIBS="$save_LIBS"
++	
++	
++LIBS="$LIBS ${LIB_SOCKET}"
++
++cyrus_cv_getaddrinfo=yes
++
++echo "$as_me:$LINENO: checking for getaddrinfo" >&5
++echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
++if test "${ac_cv_func_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getaddrinfo innocuous_getaddrinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getaddrinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getaddrinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
++choke me
++#else
++char (*f) () = getaddrinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getaddrinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
++if test $ac_cv_func_getaddrinfo = yes; then
++    ac_cv_lib_socket_getaddrinfo=no
++  ac_cv_lib_inet6_getaddrinfo=no
++
++else
++    echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
++echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++int
++main ()
++{
++getaddrinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6
++if test $ac_cv_lib_socket_getaddrinfo = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getaddrinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
++echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++int
++main ()
++{
++getaddrinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6
++if test $ac_cv_lib_inet6_getaddrinfo = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_getaddrinfo=no
++if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
++     -o $ac_cv_lib_inet6_getaddrinfo = yes
++then
++  ipv6_cv_getaddrinfo=yes
++fi
++if test $ipv6_cv_getaddrinfo = no; then
++  if test getaddrinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getaddrinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}getaddrinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}getaddrinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}getaddrinfo) || defined (__stub___${ipv6_cv_pfx}getaddrinfo)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}getaddrinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}getaddrinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_getaddrinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getaddrinfo = yes; then
++  
++echo "$as_me:$LINENO: checking for gai_strerror" >&5
++echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
++if test "${ac_cv_func_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gai_strerror innocuous_gai_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gai_strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gai_strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror)
++choke me
++#else
++char (*f) () = gai_strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gai_strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6
++if test $ac_cv_func_gai_strerror = yes; then
++    ac_cv_lib_socket_gai_strerror=no
++  ac_cv_lib_inet6_gai_strerror=no
++
++else
++    echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
++echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++int
++main ()
++{
++gai_strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6
++if test $ac_cv_lib_socket_gai_strerror = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_gai_strerror=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
++echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++int
++main ()
++{
++gai_strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6
++if test $ac_cv_lib_inet6_gai_strerror = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_gai_strerror=no
++if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
++     -o $ac_cv_lib_inet6_gai_strerror = yes
++then
++  ipv6_cv_gai_strerror=yes
++fi
++if test $ipv6_cv_gai_strerror = no; then
++  if test gai_strerror = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}gai_strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}gai_strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}gai_strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}gai_strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}gai_strerror) || defined (__stub___${ipv6_cv_pfx}gai_strerror)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}gai_strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}gai_strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_gai_strerror=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_gai_strerror = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++else
++  cyrus_cv_getaddrinfo=no
++fi
++else
++  cyrus_cv_getaddrinfo=no
++fi
++
++if test $cyrus_cv_getaddrinfo = no; then
++	IPV6_OBJS="getaddrinfo.o"
++fi
++
++cyrus_cv_getnameinfo=yes
++
++echo "$as_me:$LINENO: checking for getnameinfo" >&5
++echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
++if test "${ac_cv_func_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getnameinfo innocuous_getnameinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getnameinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getnameinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo)
++choke me
++#else
++char (*f) () = getnameinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getnameinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6
++if test $ac_cv_func_getnameinfo = yes; then
++    ac_cv_lib_socket_getnameinfo=no
++  ac_cv_lib_inet6_getnameinfo=no
++
++else
++    echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
++echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++int
++main ()
++{
++getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6
++if test $ac_cv_lib_socket_getnameinfo = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getnameinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
++echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++int
++main ()
++{
++getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6
++if test $ac_cv_lib_inet6_getnameinfo = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_getnameinfo=no
++if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
++     -o $ac_cv_lib_inet6_getnameinfo = yes
++then
++  ipv6_cv_getnameinfo=yes
++fi
++if test $ipv6_cv_getnameinfo = no; then
++  if test getnameinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getnameinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}getnameinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}getnameinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}getnameinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}getnameinfo) || defined (__stub___${ipv6_cv_pfx}getnameinfo)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}getnameinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}getnameinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_getnameinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getnameinfo = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETNAMEINFO 
++_ACEOF
++
++else
++  cyrus_cv_getnameinfo=no
++fi
++
++if test $cyrus_cv_getnameinfo = no; then
++	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++fi
++
++
++echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
++echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6
++if test "${ipv6_cv_ss_family+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr_storage ss; int i = ss.ss_family;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ipv6_cv_ss_family=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ipv6_cv_ss_family=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test $ipv6_cv_ss_family = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SS_FAMILY 
++_ACEOF
++
++else
++  :
++fi
++echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
++echo "${ECHO_T}$ipv6_cv_ss_family" >&6
++
++echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
++echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6
++if test "${ipv6_cv_sa_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr sa; int i = sa.sa_len;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ipv6_cv_sa_len=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ipv6_cv_sa_len=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test $ipv6_cv_sa_len = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SOCKADDR_SA_LEN 
++_ACEOF
++
++else
++  :
++fi
++echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
++echo "${ECHO_T}$ipv6_cv_sa_len" >&6
++
++
++
++
++for ac_header in sys/time.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_time=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_time=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6
++if test $ac_cv_header_time = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TIME_WITH_SYS_TIME 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
++if test "${ac_cv_struct_tm+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <time.h>
++
++int
++main ()
++{
++struct tm *tp; tp->tm_sec;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_struct_tm=time.h
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_struct_tm=sys/time.h
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
++echo "${ECHO_T}$ac_cv_struct_tm" >&6
++if test $ac_cv_struct_tm = sys/time.h; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TM_IN_SYS_TIME 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
++echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
++if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++
++int
++main ()
++{
++static struct tm ac_aggr;
++if (ac_aggr.tm_zone)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_tm_tm_zone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++
++int
++main ()
++{
++static struct tm ac_aggr;
++if (sizeof ac_aggr.tm_zone)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_tm_tm_zone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_member_struct_tm_tm_zone=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
++echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
++if test $ac_cv_member_struct_tm_tm_zone = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_TM_TM_ZONE 1
++_ACEOF
++
++
++fi
++
++if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_TM_ZONE 1
++_ACEOF
++
++else
++  echo "$as_me:$LINENO: checking for tzname" >&5
++echo $ECHO_N "checking for tzname... $ECHO_C" >&6
++if test "${ac_cv_var_tzname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++#ifndef tzname /* For SGI.  */
++extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
++#endif
++
++int
++main ()
++{
++atoi(*tzname);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_tzname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_tzname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
++echo "${ECHO_T}$ac_cv_var_tzname" >&6
++  if test $ac_cv_var_tzname = yes; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_TZNAME 1
++_ACEOF
++
++  fi
++fi
++
++
++
++
++
++
++
++
++for ac_func in vprintf
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++echo "$as_me:$LINENO: checking for _doprnt" >&5
++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
++if test "${ac_cv_func__doprnt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define _doprnt innocuous__doprnt
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char _doprnt (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef _doprnt
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char _doprnt ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub__doprnt) || defined (__stub____doprnt)
++choke me
++#else
++char (*f) () = _doprnt;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != _doprnt;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func__doprnt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func__doprnt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
++echo "${ECHO_T}$ac_cv_func__doprnt" >&6
++if test $ac_cv_func__doprnt = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DOPRNT 1
++_ACEOF
++
++fi
++
++fi
++done
++
++
++
++
++CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++
++
++
++# Check whether --with-bdb or --without-bdb was given.
++if test "${with_bdb+set}" = set; then
++  withval="$with_bdb"
++  with_bdb=$withval
++else
++  with_bdb="yes"
++fi; 
++
++
++# Check whether --with-dbdir or --without-dbdir was given.
++if test "${with_dbdir+set}" = set; then
++  withval="$with_dbdir"
++  with_bdb=$withval
++fi; 
++
++case "$with_bdb" in
++  no)
++	use_berkeley="no"
++	;;
++  yes)
++	use_berkeley="yes"
++	with_bdb_lib=none
++	with_bdb_inc=none
++	;;
++  
++  *)
++	use_berkeley="yes"
++	with_bdb_lib="$with_bdb/lib"
++	with_bdb_inc="$with_bdb/include"
++	;;
++esac
++
++if test "$use_berkeley" != "no"; then
++  
++
++# Check whether --with-bdb-libdir or --without-bdb-libdir was given.
++if test "${with_bdb_libdir+set}" = set; then
++  withval="$with_bdb_libdir"
++  with_bdb_lib=$withval
++else
++   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
++fi; 
++
++# Check whether --with-bdb-incdir or --without-bdb-incdir was given.
++if test "${with_bdb_incdir+set}" = set; then
++  withval="$with_bdb_incdir"
++  with_bdb_inc=$withval
++else
++   test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
++fi; 
++
++
++	
++
++	cmu_save_CPPFLAGS=$CPPFLAGS
++
++	if test -d $with_bdb_inc; then
++	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
++	    BDB_INCADD="-I$with_bdb_inc"
++	else
++	    BDB_INCADD=""
++	fi
++
++	                if test "${ac_cv_header_db_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for db.h" >&5
++echo $ECHO_N "checking for db.h... $ECHO_C" >&6
++if test "${ac_cv_header_db_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
++echo "${ECHO_T}$ac_cv_header_db_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking db.h usability" >&5
++echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <db.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking db.h presence" >&5
++echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <db.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: db.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for db.h" >&5
++echo $ECHO_N "checking for db.h... $ECHO_C" >&6
++if test "${ac_cv_header_db_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_db_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
++echo "${ECHO_T}$ac_cv_header_db_h" >&6
++
++fi
++if test $ac_cv_header_db_h = yes; then
++  
++	BDB_SAVE_LDFLAGS=$LDFLAGS
++
++	if test -d $with_bdb_lib; then
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
++  else
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++	else
++	    BDB_LIBADD=""
++	fi
++
++	saved_LIBS=$LIBS
++        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <db.h>
++int
++main ()
++{
++db_create(NULL, NULL, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	    if test "$dblib" = "berkeley"; then break; fi
++          done
++        if test "$dblib" = "no"; then
++	    LIBS="$saved_LIBS -ldb"
++	    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <db.h>
++int
++main ()
++{
++db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        fi
++	LIBS=$saved_LIBS
++
++	LDFLAGS=$BDB_SAVE_LDFLAGS
++
++else
++  dblib="no"
++fi
++
++
++
++	CPPFLAGS=$cmu_save_CPPFLAGS
++
++
++  if test "$dblib" = "no"; then
++    { { echo "$as_me:$LINENO: error: Berkeley DB 3.x or later was not found.  You may need to 
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&5
++echo "$as_me: error: Berkeley DB 3.x or later was not found.  You may need to 
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++
++  if test "$with_bdb_lib" != "none"; then
++    
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
++  fi
++
++  fi
++
++  BDB_INC=${BDB_INCADD}
++  BDB_LIB=${BDB_LIBADD}
++  
++  
++
++  LIBS="${LIBS} ${BDB_LIBADD}"
++  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
++
++  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_BDB 
++_ACEOF
++
++fi
++
++
++
++
++SIEVE_SUBDIRS=""
++sievedir="sieve"
++# Check whether --enable-sieve or --disable-sieve was given.
++if test "${enable_sieve+set}" = set; then
++  enableval="$enable_sieve"
++  if test "$enableval" = no; then
++ 		sievedir="no"
++	fi
++fi; 
++
++if test "$sievedir" != "no"; then
++	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
++	
++	SIEVE_LIBS="../${sievedir}/libsieve.a"
++	
++	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define USE_SIEVE 
++_ACEOF
++
++
++		for ac_prog in 'bison -y' byacc
++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_YACC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  echo "$as_me:$LINENO: result: $YACC" >&5
++echo "${ECHO_T}$YACC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$YACC" && break
++done
++test -n "$YACC" || YACC="yacc"
++
++	for ac_prog in flex lex
++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_LEX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  echo "$as_me:$LINENO: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
++if test -z "$LEXLIB"
++then
++  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_fl_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_fl_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
++if test $ac_cv_lib_l_yywrap = yes; then
++  LEXLIB="-ll"
++fi
++
++fi
++
++fi
++
++if test "x$LEX" != "x:"; then
++  echo "$as_me:$LINENO: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_root+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # The minimal lex program is just a single line: %%.  But some broken lexes
++# (Solaris, I think it was) want two %% lines, so accommodate them.
++cat >conftest.l <<_ACEOF
++%%
++%%
++_ACEOF
++{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
++  (eval $LEX conftest.l) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
++rm -f conftest.l
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent. Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
++ac_save_LIBS=$LIBS
++LIBS="$LIBS $LEXLIB"
++cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_lex_yytext_pointer=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
++rm -f "${LEX_OUTPUT_ROOT}.c"
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define YYTEXT_POINTER 1
++_ACEOF
++
++fi
++
++fi
++	
++echo "$as_me:$LINENO: checking for main in -lfl" >&5
++echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_main+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++
++int
++main ()
++{
++main ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_fl_main=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_fl_main=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_main" >&6
++if test $ac_cv_lib_fl_main = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBFL 1
++_ACEOF
++
++  LIBS="-lfl $LIBS"
++
++fi
++
++
++ 	echo "$as_me:$LINENO: checking for library containing regcomp" >&5
++echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6
++if test "${ac_cv_search_regcomp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_regcomp=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char regcomp ();
++int
++main ()
++{
++regcomp ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_regcomp="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_regcomp" = no; then
++  for ac_lib in rx regex; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char regcomp ();
++int
++main ()
++{
++regcomp ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_regcomp="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
++echo "${ECHO_T}$ac_cv_search_regcomp" >&6
++if test "$ac_cv_search_regcomp" != no; then
++  test "$ac_cv_search_regcomp" = "none required" || LIBS="$ac_cv_search_regcomp $LIBS"
++  
++ 			
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_REGEX 
++_ACEOF
++
++		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for rxposix.h" >&5
++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
++if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking rxposix.h usability" >&5
++echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <rxposix.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking rxposix.h presence" >&5
++echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <rxposix.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: rxposix.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for rxposix.h" >&5
++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
++if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_rxposix_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
++
++fi
++if test $ac_cv_header_rxposix_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_RX 
++_ACEOF
++
++fi
++
++
++fi
++
++  		
++
++	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
++fi
++
++
++
++echo "$as_me:$LINENO: checking for strerror" >&5
++echo $ECHO_N "checking for strerror... $ECHO_C" >&6
++if test "${ac_cv_func_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strerror to an innocuous variant, in case <limits.h> declares strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strerror innocuous_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strerror) || defined (__stub___strerror)
++choke me
++#else
++char (*f) () = strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
++echo "${ECHO_T}$ac_cv_func_strerror" >&6
++if test $ac_cv_func_strerror = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAS_STRERROR 
++_ACEOF
++
++else
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_SYS_ERRLIST 
++_ACEOF
++
++fi
++
++
++
++for ac_header in sys/resource.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++for ac_func in setrlimit
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++for ac_func in getrlimit
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++for ac_func in daemon setsid
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++for ac_func in shutdown
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/socket.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "socklen_t" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SOCKLEN_T 
++_ACEOF
++
++fi
++rm -f conftest*
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/socket.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "sockaddr_storage" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/resource.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "rlim_t" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_RLIM_T 
++_ACEOF
++
++fi
++rm -f conftest*
++
++
++spt_type=""
++echo "$as_me:$LINENO: checking for setproctitle" >&5
++echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6
++if test "${ac_cv_func_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define setproctitle to an innocuous variant, in case <limits.h> declares setproctitle.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define setproctitle innocuous_setproctitle
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char setproctitle (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef setproctitle
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setproctitle ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_setproctitle) || defined (__stub___setproctitle)
++choke me
++#else
++char (*f) () = setproctitle;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != setproctitle;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
++echo "${ECHO_T}$ac_cv_func_setproctitle" >&6
++if test $ac_cv_func_setproctitle = yes; then
++  spt_type=SPT_BUILTIN
++fi
++
++if test "$spt_type" = ""; then
++		echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
++echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
++if test "${ac_cv_lib_util_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setproctitle ();
++int
++main ()
++{
++setproctitle ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_util_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_util_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
++echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
++if test $ac_cv_lib_util_setproctitle = yes; then
++  spt_type=SPT_BUILTIN
++			LIBS="${LIBS} -lutil"
++fi
++
++fi
++if test "$spt_type" = ""; then
++	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
++echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sys/pstat.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
++echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/pstat.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sys_pstat_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
++
++fi
++if test $ac_cv_header_sys_pstat_h = yes; then
++  spt_type=SPT_PSTAT
++fi
++
++
++fi
++if test "$spt_type" = ""; then
++	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
++echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sys/sysnews.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
++echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/sysnews.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sys_sysnews_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
++
++fi
++if test $ac_cv_header_sys_sysnews_h = yes; then
++  spt_type=SPT_SYSMIPS
++fi
++
++
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
++echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_psstrings+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <machine/vmparam.h>
++#include <sys/exec.h>
++#ifndef PS_STRINGS
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_psstrings=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_psstrings=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_psstrings = yes; then
++		spt_type=SPT_PSSTRINGS
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
++echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for SCO" >&5
++echo $ECHO_N "checking for SCO... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_sco+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifndef _SCO_unix_
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_sco=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_sco=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_sco = yes; then
++		spt_type=SPT_SCO
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
++echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for setproctitle usability" >&5
++echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_setproctitle = no; then
++		spt_type=SPT_NONE
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
++echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6
++fi
++if test "$spt_type" != ""; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SPT_TYPE $spt_type
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking nonblocking method" >&5
++echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6
++if test "${cyrus_cv_sys_nonblock+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/file.h>
++#include <fcntl.h>
++#ifndef	FNDELAY
++#define FNDELAY		O_NDELAY
++#endif
++int
++main ()
++{
++fcntl(0, F_GETFL, 0)&FNDELAY
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_sys_nonblock=fcntl
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cyrus_cv_sys_nonblock=ioctl
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++WITH_NONBLOCK=$cyrus_cv_sys_nonblock
++
++echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
++echo "${ECHO_T}$WITH_NONBLOCK" >&6
++
++echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
++echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6
++if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <time.h>
++int
++main ()
++{
++struct tm tm;
++tm.tm_gmtoff = 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_struct_sys_gmtoff=tm
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cyrus_cv_struct_sys_gmtoff=gmtime
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
++
++echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
++echo "${ECHO_T}$WITH_GMTOFF" >&6
++echo "$as_me:$LINENO: checking for shared mmap" >&5
++echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6
++if test "${cyrus_cv_func_mmap_shared+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  cyrus_cv_func_mmap_shared=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base+4, "test", 4) != 0) exit(1);
++exit(0);}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_func_mmap_shared=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++cyrus_cv_func_mmap_shared=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++
++echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
++echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6
++if test $cyrus_cv_func_mmap_shared = yes; then
++	WITH_MAP="shared"
++else
++echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
++echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6
++if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  cyrus_cv_func_mmap_stupidshared=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++lseek(fd, 0L, 0);	
++if (write(fd, "xyzz", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base, "xyzz", 4) != 0) exit(1);
++exit(0);}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_func_mmap_stupidshared=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++cyrus_cv_func_mmap_stupidshared=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++
++echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
++echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6
++if test $cyrus_cv_func_mmap_stupidshared = yes; then
++	WITH_MAP="stupidshared"
++else
++	{ echo "$as_me:$LINENO: WARNING: *** This system does not have a working mmap()" >&5
++echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: *** Expect a considerable performance penalty" >&5
++echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
++	WITH_MAP=nommap
++fi
++fi
++
++
++
++# Check whether --with-lock or --without-lock was given.
++if test "${with_lock+set}" = set; then
++  withval="$with_lock"
++  WITH_LOCK="$withval"
++else
++  
++  echo "$as_me:$LINENO: checking for fcntl" >&5
++echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
++if test "${ac_cv_func_fcntl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fcntl to an innocuous variant, in case <limits.h> declares fcntl.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fcntl innocuous_fcntl
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fcntl (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fcntl
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fcntl ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fcntl) || defined (__stub___fcntl)
++choke me
++#else
++char (*f) () = fcntl;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fcntl;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fcntl=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fcntl=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
++echo "${ECHO_T}$ac_cv_func_fcntl" >&6
++if test $ac_cv_func_fcntl = yes; then
++  WITH_LOCK="fcntl"
++else
++  
++		echo "$as_me:$LINENO: checking for flock" >&5
++echo $ECHO_N "checking for flock... $ECHO_C" >&6
++if test "${ac_cv_func_flock+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define flock to an innocuous variant, in case <limits.h> declares flock.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define flock innocuous_flock
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char flock (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef flock
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char flock ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_flock) || defined (__stub___flock)
++choke me
++#else
++char (*f) () = flock;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != flock;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_flock=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_flock=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
++echo "${ECHO_T}$ac_cv_func_flock" >&6
++if test $ac_cv_func_flock = yes; then
++  WITH_LOCK="flock"
++else
++  
++				{ { echo "$as_me:$LINENO: error: unable to detect locking method" >&5
++echo "$as_me: error: unable to detect locking method" >&2;}
++   { (exit 1); exit 1; }; }
++			      
++fi
++
++		
++fi
++
++  
++fi; 
++
++
++
++LIB_RT=""
++echo "$as_me:$LINENO: checking for fdatasync" >&5
++echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
++if test "${ac_cv_func_fdatasync+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fdatasync innocuous_fdatasync
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fdatasync (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fdatasync
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fdatasync ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fdatasync) || defined (__stub___fdatasync)
++choke me
++#else
++char (*f) () = fdatasync;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fdatasync;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fdatasync=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fdatasync=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
++echo "${ECHO_T}$ac_cv_func_fdatasync" >&6
++if test $ac_cv_func_fdatasync = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FDATASYNC 
++_ACEOF
++
++else
++  
++  echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
++echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
++if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fdatasync ();
++int
++main ()
++{
++fdatasync ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rt_fdatasync=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rt_fdatasync=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6
++if test $ac_cv_lib_rt_fdatasync = yes; then
++  
++	LIB_RT="-lrt"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FDATASYNC 
++_ACEOF
++
++  
++fi
++
++
++fi
++
++
++cant_find_sigvec=no
++if test "${cyrus_sigveclib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++  echo "$as_me:$LINENO: checking for sigvec" >&5
++echo $ECHO_N "checking for sigvec... $ECHO_C" >&6
++if test "${ac_cv_func_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define sigvec to an innocuous variant, in case <limits.h> declares sigvec.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define sigvec innocuous_sigvec
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char sigvec (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef sigvec
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_sigvec) || defined (__stub___sigvec)
++choke me
++#else
++char (*f) () = sigvec;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != sigvec;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
++echo "${ECHO_T}$ac_cv_func_sigvec" >&6
++if test $ac_cv_func_sigvec = yes; then
++  
++	cyrus_sigveclib=""
++  
++else
++  
++    echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
++echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6
++if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lBSD  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++int
++main ()
++{
++sigvec ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_BSD_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_BSD_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
++echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6
++if test $ac_cv_lib_BSD_sigvec = yes; then
++  cyrus_sigveclib="-lBSD"
++else
++  
++        SAVE_LDFLAGS="$LDFLAGS"
++        LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
++    echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
++echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6
++if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lucb  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++int
++main ()
++{
++sigvec ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ucb_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ucb_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6
++if test $ac_cv_lib_ucb_sigvec = yes; then
++  
++            cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
++else
++   cant_find_sigvec=yes 
++fi
++
++    LDFLAGS="$SAVE_LDFLAGS"
++fi
++
++  
++fi
++
++
++fi
++
++
++
++# ok, we still look for this stuff because of checking groups, but
++# all authentication goes through SASL
++
++
++# Check whether --with-afs or --without-afs was given.
++if test "${with_afs+set}" = set; then
++  withval="$with_afs"
++  with_afs="${withval}"
++else
++  with_afs="no"
++fi; 
++
++
++# Check whether --with-ldap or --without-ldap was given.
++if test "${with_ldap+set}" = set; then
++  withval="$with_ldap"
++  with_ldap="${withval}"
++else
++  with_ldap="no"
++fi; 
++
++# Check whether --enable-krb5afspts or --disable-krb5afspts was given.
++if test "${enable_krb5afspts+set}" = set; then
++  enableval="$enable_krb5afspts"
++  SASL_GSSAPI_LIBS_SET="yes"
++
++         
++cat >>confdefs.h <<\_ACEOF
++@%:@define AFSPTS_USE_KRB5 
++_ACEOF
++
++fi; 
++
++if test "x$with_afs" != "xno"; then
++    if test ! -d $with_afs; then
++        $with_afs=/usr/local
++    fi
++    CFLAGS="${CFLAGS} -I${with_afs}/include"
++    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
++    if test -f ${with_afs}/lib/afs/libaudit.a; then
++    AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
++    fi
++    if test -f /usr/ucblib/libucb.a; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
++  else
++	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_runpath_switch/usr/ucblib"
++  fi
++
++    AFS_LIBS="$AFS_LIBS -lc -lucb"
++    fi
++
++    if test "${cyrus_afs_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++        SAVE_LIBS="$LIBS"
++        LIBS="${with_afs}/lib/liblwp.a"
++        echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
++echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6
++                        cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++IOMGR_Initialize();
++int
++main ()
++{
++IOMGR_Initialize()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++                                                echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++                        cyrus_afs_sigvec="no"
++                
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++                                                echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++                        cyrus_afs_sigvec="yes"
++                
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        
++fi
++
++    if test "$cyrus_afs_sigvec" = yes; then
++      if test "$cant_find_sigvec" = yes; then
++        { echo "$as_me:$LINENO: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
++echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
++      else
++        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
++        
++        
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_AFSKRB 
++_ACEOF
++
++      fi
++    else
++      AFS_LIBS="${AFS_LIBS}"
++      
++      
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_AFSKRB 
++_ACEOF
++
++    fi
++    LIBS="$SAVE_LIBS"
++fi
++
++LDAP_CPPFLAGS=""
++LDAP_LDFLAGS=""
++LDAP_LIBS=""
++
++if test "x$with_ldap" != "xno"; then
++    if test ! -d $with_ldap; then
++        $with_ldap=/usr/local
++    fi
++
++    LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
++    LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
++    LDAP_LIBS=""
++
++    save_CPPFLAGS=$CPPFLAGS
++    save_LDFLAGS=$LDFLAGS
++    CPPFLAGS=$LDAP_CPPFLAGS
++    LDFLAGS=$LDAP_LDFLAGS
++
++    echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
++echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
++if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lldap -llber $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ldap_initialize ();
++int
++main ()
++{
++ldap_initialize ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ldap_ldap_initialize=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ldap_ldap_initialize=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
++echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
++if test $ac_cv_lib_ldap_ldap_initialize = yes; then
++   
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LDAP 
++_ACEOF
++
++          
++          
++          	
++          LDAP_LIBS="-lldap -llber" 
++fi
++
++
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++fi
++
++if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define WITH_PTS 
++_ACEOF
++
++fi
++
++SERVER_SUBDIRS="master imap"
++# Check whether --enable-server or --disable-server was given.
++if test "${enable_server+set}" = set; then
++  enableval="$enable_server"
++  if test "$enableval" = no; then
++        	SERVER_SUBDIRS=""
++	fi
++fi; 
++
++# We always output a server makefile (just because we can)
++
++
++# Check whether --with-krb or --without-krb was given.
++if test "${with_krb+set}" = set; then
++  withval="$with_krb"
++  with_krb="$withval"
++else
++  with_krb="no"
++fi; 
++
++
++# Check whether --with-krbimpl or --without-krbimpl was given.
++if test "${with_krbimpl+set}" = set; then
++  withval="$with_krbimpl"
++  with_krbimpl="$withval"
++else
++  with_krbimpl="kth"
++fi; 
++
++# Check whether --enable-statickrb or --disable-statickrb was given.
++if test "${enable_statickrb+set}" = set; then
++  enableval="$enable_statickrb"
++  with_statickrb="yes"
++else
++  with_statickrb="no"
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBRESOLV 1
++_ACEOF
++
++  LIBS="-lresolv $LIBS"
++
++fi
++
++
++if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
++      { { echo "$as_me:$LINENO: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&5
++echo "$as_me: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&2;}
++   { (exit 1); exit 1; }; }
++fi 
++
++if test "$with_krb" != "no"; then
++
++# Check whether --with-krbdes or --without-krbdes was given.
++if test "${with_krbdes+set}" = set; then
++  withval="$with_krbdes"
++  with_krbdes="$withval"
++else
++  with_krbdes="yes"
++fi; 
++if test "$with_krbdes" = "yes"; then
++  echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
++echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6
++if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldes  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char des_ecb_encrypt ();
++int
++main ()
++{
++des_ecb_encrypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_des_des_ecb_encrypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_des_des_ecb_encrypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6
++if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
++  if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$with_krb/lib/libdes.a"
++      else
++          KRB_LIBS="-ldes"
++      fi
++else
++  { { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
++echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++fi
++fi
++
++if test -d ${with_krb}; then
++   echo "$as_me:$LINENO: checking for Kerberos includes" >&5
++echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6
++if test "${cyrus_krbinclude+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++     for krbhloc in include/kerberosIV include
++     do
++       if test -f ${with_krb}/${krbhloc}/krb.h ; then
++         cyrus_krbinclude=${with_krb}/${krbhloc}
++         break
++       fi
++     done
++     
++fi
++echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
++echo "${ECHO_T}$cyrus_krbinclude" >&6
++
++   if test -n "${cyrus_krbinclude}"; then
++     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
++   fi
++   
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L${with_krb}/lib $andrew_runpath_switch${with_krb}/lib ${LDFLAGS}"
++  fi
++
++fi
++
++if test "$with_krbimpl" != "kth"; then
++  KRBLIB="krb4"
++else
++  KRBLIB="krb"
++fi
++
++if test "$with_des" != no; then
++  if test "${ac_cv_header_krb_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for krb.h" >&5
++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
++if test "${ac_cv_header_krb_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking krb.h usability" >&5
++echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <krb.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking krb.h presence" >&5
++echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <krb.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for krb.h" >&5
++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
++if test "${ac_cv_header_krb_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_krb_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb_h" >&6
++
++fi
++if test $ac_cv_header_krb_h = yes; then
++  as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
++echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char krb_mk_priv ();
++int
++main ()
++{
++krb_mk_priv ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Lib=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Lib=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++  if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
++      else
++          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
++      fi
++else
++  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++fi
++
++else
++  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++fi
++
++
++else
++  { echo "$as_me:$LINENO: WARNING: No DES library found for Kerberos V4 support" >&5
++echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
++  krb4=no
++fi
++
++if test "${krb4}" != no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_KRB 
++_ACEOF
++
++fi
++
++LIBS="$KRB_LIBS $LIBS"
++
++SASL_GSSAPI_LIBS_SET="yes"
++
++
++IMAP_PROGS=""
++
++# Check whether --with-openssl or --without-openssl was given.
++if test "${with_openssl+set}" = set; then
++  withval="$with_openssl"
++  with_openssl="${withval}"
++fi; 
++
++OPENSSL_INC=
++OPENSSL_LIB=
++case "$with_openssl" in
++	no) with_openssl="no";;
++	""|yes) 
++	  	                  LIB_RSAREF=""
++	        echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
++echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6
++if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrsaref  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char RSAPublicEncrypt ();
++int
++main ()
++{
++RSAPublicEncrypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rsaref_RSAPublicEncrypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rsaref_RSAPublicEncrypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6
++if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
++  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
++else
++  cmu_have_rsaref=no
++fi
++
++
++		with_openssl="yes"
++		echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
++echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypto $LIB_RSAREF $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char BIO_accept ();
++int
++main ()
++{
++BIO_accept ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypto_BIO_accept=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypto_BIO_accept=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6
++if test $ac_cv_lib_crypto_BIO_accept = yes; then
++  LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
++else
++  with_openssl="no"
++fi
++
++		echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
++echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char SSL_CTX_new ();
++int
++main ()
++{
++SSL_CTX_new ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ssl_SSL_CTX_new=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ssl_SSL_CTX_new=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6
++if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
++  LIBS="-lssl ${LIBS}"
++else
++  with_openssl="no"
++fi
++
++		
++		;;
++	*)  OPENSSL_INC="-I${with_openssl}/include"
++	    OPENSSL_LIBPATH="${with_openssl}/lib"
++	    OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
++	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
++	    
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
++  else
++	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
++  fi
++
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
++  else
++	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_runpath_switch${OPENSSL_LIBPATH}"
++  fi
++
++	    LIBS="${LIBS} -lssl -lcrypto";;
++esac
++
++echo "$as_me:$LINENO: checking for openssl" >&5
++echo $ECHO_N "checking for openssl... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $with_openssl" >&5
++echo "${ECHO_T}$with_openssl" >&6
++
++if test "$with_openssl" != "no"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SSL 
++_ACEOF
++
++	IMAP_PROGS="$IMAP_PROGS tls_prune"
++        if test "${krb4}" != no; then
++           
++cat >>confdefs.h <<\_ACEOF
++@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT 
++_ACEOF
++
++           
++cat >>confdefs.h <<\_ACEOF
++@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY 
++_ACEOF
++
++        fi
++fi
++
++
++
++
++# Check whether --with-egd-socket or --without-egd-socket was given.
++if test "${with_egd_socket+set}" = set; then
++  withval="$with_egd_socket"
++   EGD_SOCKET="$withval" 
++      
++fi; 
++if test -n "$EGD_SOCKET" ; then
++      
++cat >>confdefs.h <<_ACEOF
++@%:@define EGD_SOCKET "$EGD_SOCKET"
++_ACEOF
++
++fi
++
++
++# Check whether --with-zephyr or --without-zephyr was given.
++if test "${with_zephyr+set}" = set; then
++  withval="$with_zephyr"
++  with_zephyr="${withval}"
++fi; 
++if test -z "$with_zephyr"; then
++     if test -f /usr/local/lib/libzephyr.a; then
++	with_zephyr="/usr/local"
++     elif test -f /usr/lib/libzephyr.a; then
++        with_zephyr="/usr"
++     fi
++fi
++ZEPHYR_LIBS=""
++ZEPHYR_CPPFLAGS=""
++case "$with_zephyr" in
++	no) true;;
++	""|yes) echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
++echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6
++if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lzephyr  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ZInitialize ();
++int
++main ()
++{
++ZInitialize ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_zephyr_ZInitialize=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_zephyr_ZInitialize=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
++echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6
++if test $ac_cv_lib_zephyr_ZInitialize = yes; then
++  ZEPHYR_LIBS="-lzephyr"
++else
++  with_zephyr="no"
++fi
++;;
++       *)  if test -d ${with_zephyr}/include/zephyr; then
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
++           else
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
++           fi
++           ZEPHYR_LIBS="-lzephyr";;
++esac
++
++
++if test "$with_zephyr" != "no"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ZEPHYR 
++_ACEOF
++
++fi
++
++
++# Check whether --with-pidfile or --without-pidfile was given.
++if test "${with_pidfile+set}" = set; then
++  withval="$with_pidfile"
++  MASTERPIDFILE="$withval"
++else
++  MASTERPIDFILE="/var/run/cyrus-master.pid"
++fi; 
++MASTERPIDFILE="\"$MASTERPIDFILE\""
++
++cat >>confdefs.h <<_ACEOF
++@%:@define MASTER_PIDFILE $MASTERPIDFILE
++_ACEOF
++
++
++
++# Check whether --with-idle or --without-idle was given.
++if test "${with_idle+set}" = set; then
++  withval="$with_idle"
++  WITH_IDLE="${withval}"
++else
++  WITH_IDLE="poll"
++fi; 
++
++if test "$WITH_IDLE" = "idled"; then
++  IMAP_PROGS="$IMAP_PROGS idled"
++fi
++
++ENABLE_NNTP=no
++# Check whether --enable-nntp or --disable-nntp was given.
++if test "${enable_nntp+set}" = set; then
++  enableval="$enable_nntp"
++  ENABLE_NNTP=$enableval
++        if test "$ENABLE_NNTP" != no; then
++	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
++        fi
++fi;  
++
++# Check whether --enable-murder or --disable-murder was given.
++if test "${enable_murder+set}" = set; then
++  enableval="$enable_murder"
++  if test "$enableval" != no; then
++	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
++        fi
++fi;  
++
++
++
++
++# Check whether --with-com_err or --without-com_err was given.
++if test "${with_com_err+set}" = set; then
++  withval="$with_com_err"
++  
++fi; 
++if test -z "$with_com_err"; then
++	# no value supplied
++	echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
++echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
++if test "${ac_cv_lib_com_err_com_err+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcom_err  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char com_err ();
++int
++main ()
++{
++com_err ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_com_err_com_err=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_com_err_com_err=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
++echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
++if test $ac_cv_lib_com_err_com_err = yes; then
++  
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for et/com_err.h" >&5
++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
++echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <et/com_err.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
++echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <et/com_err.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for et/com_err.h" >&5
++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_et_com_err_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
++
++fi
++if test $ac_cv_header_et_com_err_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ET_COM_ERR_H 
++_ACEOF
++
++else
++  if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for com_err.h" >&5
++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking com_err.h usability" >&5
++echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <com_err.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking com_err.h presence" >&5
++echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <com_err.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: com_err.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for com_err.h" >&5
++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_com_err_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
++
++fi
++if test $ac_cv_header_com_err_h = yes; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: cannot locate com_err.h" >&5
++echo "$as_me: error: cannot locate com_err.h" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++fi
++
++
++		# Extract the first word of "compile_et", so it can be a program name with args.
++set dummy compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	
++else
++  
++	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
++		with_com_err="/usr/local"
++		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
++set dummy /usr/local/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
++		with_com_err="/usr"
++		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
++set dummy /usr/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	else
++		# use ours
++		with_com_err=yes
++	fi
++	
++fi
++
++
++	if test "${with_com_err}" = "no"; then
++	  { echo "$as_me:$LINENO: WARNING: com_err is required; included version will be used." >&5
++echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
++	  with_com_err="yes"
++	fi
++	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
++	  { echo "$as_me:$LINENO: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
++echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
++	  { echo "$as_me:$LINENO: WARNING: Will build com_err from included sources." >&5
++echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
++	  with_com_err="yes" # build it ourselves
++	fi
++fi
++
++case "$with_com_err" in
++  # built-in et
++  yes) # use the com_err we're gonna build
++	  COM_ERR_LIBS="../et/libcom_err.a"
++	  COMPILE_ET="../et/compile_et"
++	  COM_ERR_LDFLAGS=""
++	  COM_ERR_CPPFLAGS="-I\${top_srcdir}/et"
++	  PRE_SUBDIRS="et ${PRE_SUBDIRS}"
++	  EXTRA_OUTPUT="${EXTRA_OUTPUT} et/Makefile"
++	  ;;
++  "")   # no problem, we already have it in the paths
++	# we do nothing to pick it up
++	COM_ERR_LIBS="-lcom_err" # hope it's not shared
++	# we already set COMPILE_ET, or we didn't get here
++	COM_ERR_LDFLAGS=""
++	COM_ERR_CPPFLAGS=""
++      ;;
++  *) # use whatever they told us, or whatever we found
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
++     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
++     # Ever get the feeling people hide this stuff on purpose?
++     if test -d "${with_com_err}/include/et" ; then
++       COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
++     fi
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for modern syslog" >&5
++echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6
++if test "${cyrus_cv_lib_syslog+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <syslog.h>
++#ifndef LOG_LOCAL6
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_lib_syslog=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_lib_syslog=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++if test $cyrus_cv_lib_syslog = no; then
++	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
++	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
++	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
++fi
++echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
++echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6
++
++echo "$as_me:$LINENO: checking which syslog facility to use" >&5
++echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6
++SYSLOG_FACILITY=LOG_LOCAL6
++
++# Check whether --with-syslogfacility or --without-syslogfacility was given.
++if test "${with_syslogfacility+set}" = set; then
++  withval="$with_syslogfacility"
++   if test "$withval" != "yes" -a "$withval" != "no" ; then
++                       SYSLOG_FACILITY=LOG_$withval
++               fi; 
++fi; 
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
++_ACEOF
++
++echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
++echo "${ECHO_T}$SYSLOG_FACILITY" >&6
++
++
++for ac_func in getdtablesize
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++else
++  case $LIB@&t@OBJS in
++    "$ac_func.$ac_objext"   | \
++  *" $ac_func.$ac_objext"   | \
++    "$ac_func.$ac_objext "* | \
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS $ac_func.$ac_objext" ;;
++esac
++
++fi
++done
++
++
++# Check whether --enable-cmulocal or --disable-cmulocal was given.
++if test "${enable_cmulocal+set}" = set; then
++  enableval="$enable_cmulocal"
++  if test "$enableval" = yes; then
++		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
++		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
++	fi
++fi; 
++
++echo "$as_me:$LINENO: checking to use old sieve service name" >&5
++echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6
++# Check whether --enable-oldsievename or --disable-oldsievename was given.
++if test "${enable_oldsievename+set}" = set; then
++  enableval="$enable_oldsievename"
++  if test "$enableval" = yes; then
++		echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define OLD_SIEVE_SERVICE_NAME 
++_ACEOF
++
++	else
++		echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	fi
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi; 
++
++# Check whether --enable-listext or --disable-listext was given.
++if test "${enable_listext+set}" = set; then
++  enableval="$enable_listext"
++  if test "$enableval" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_LISTEXT 
++_ACEOF
++
++	fi
++fi; 
++
++# Check whether --enable-netscapehack or --disable-netscapehack was given.
++if test "${enable_netscapehack+set}" = set; then
++  enableval="$enable_netscapehack"
++  if test "$enableval" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_X_NETSCAPE_HACK 
++_ACEOF
++
++	fi
++fi; 
++
++echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  :
++else
++  
++echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBDL 1
++_ACEOF
++
++  LIBS="-ldl $LIBS"
++
++fi
++
++fi
++
++echo "$as_me:$LINENO: checking for crypt" >&5
++echo $ECHO_N "checking for crypt... $ECHO_C" >&6
++if test "${ac_cv_func_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define crypt to an innocuous variant, in case <limits.h> declares crypt.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define crypt innocuous_crypt
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char crypt (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef crypt
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char crypt ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_crypt) || defined (__stub___crypt)
++choke me
++#else
++char (*f) () = crypt;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != crypt;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_crypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_crypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
++echo "${ECHO_T}$ac_cv_func_crypt" >&6
++if test $ac_cv_func_crypt = yes; then
++  cmu_have_crypt=yes
++else
++  echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++if test "${ac_cv_lib_crypt_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char crypt ();
++int
++main ()
++{
++crypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypt_crypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypt_crypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++if test $ac_cv_lib_crypt_crypt = yes; then
++  LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
++else
++  cmu_have_crypt=no
++fi
++
++fi
++
++
++
++
++
++# Check whether --enable-gssapi or --disable-gssapi was given.
++if test "${enable_gssapi+set}" = set; then
++  enableval="$enable_gssapi"
++  gssapi=$enableval
++else
++  gssapi=yes
++fi; 
++
++# Check whether --with-gss_impl or --without-gss_impl was given.
++if test "${with_gss_impl+set}" = set; then
++  withval="$with_gss_impl"
++  gss_impl=$withval
++else
++  gss_impl=auto
++fi; 
++
++if test "$gssapi" != no; then
++  platform=
++  case "${host}" in
++    *-*-linux*)
++      platform=__linux
++      ;;
++    *-*-hpux*)
++      platform=__hpux
++      ;;
++    *-*-irix*)
++      platform=__irix
++      ;;
++    *-*-solaris2*)
++# When should we use __sunos?
++      platform=__solaris
++      ;;
++    *-*-aix*)
++###_AIX
++      platform=__aix
++      ;;
++    *)
++      { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
++echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
++      if test "$gss_impl" = "cybersafe"; then
++        { { echo "$as_me:$LINENO: error: CyberSafe was forced, cannot continue as platform is not supported" >&5
++echo "$as_me: error: CyberSafe was forced, cannot continue as platform is not supported" >&2;}
++   { (exit 1); exit 1; }; }
++      fi
++      ;;
++  esac
++
++  cmu_saved_CPPFLAGS=$CPPFLAGS
++
++  if test -d ${gssapi}; then
++    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++# We want to keep -I in our CPPFLAGS, but only if we succeed
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++### I am not sure how useful is this (and whether this is required at all
++### especially when we have to provide two -L flags for new CyberSafe
++    LDFLAGS="$LDFLAGS -L$gssapi/lib"
++
++    if test -n "$platform"; then
++      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++        CPPFLAGS="$CPPFLAGS -D$platform"
++        if test -d "${gssapi}/appsec-sdk/include"; then
++          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++        fi
++      fi
++    fi
++  fi
++  if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for gssapi.h" >&5
++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking gssapi.h usability" >&5
++echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <gssapi.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking gssapi.h presence" >&5
++echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <gssapi.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: gssapi.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for gssapi.h" >&5
++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_gssapi_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
++
++fi
++if test $ac_cv_header_gssapi_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSSAPI_H 
++_ACEOF
++
++else
++  if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
++echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <gssapi/gssapi.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
++echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <gssapi/gssapi.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
++
++fi
++if test $ac_cv_header_gssapi_gssapi_h = yes; then
++  :
++else
++  { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
++fi
++
++
++fi
++
++
++
++  CPPFLAGS=$cmu_saved_CPPFLAGS
++
++fi
++
++if test "$gssapi" != no; then
++  # We need to find out which gssapi implementation we are
++  # using. Supported alternatives are: MIT Kerberos 5,
++  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
++  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
++  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
++  #
++  # The choice is reflected in GSSAPIBASE_LIBS
++
++  
++echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBRESOLV 1
++_ACEOF
++
++  LIBS="-lresolv $LIBS"
++
++fi
++
++  if test -d ${gssapi}; then
++     gssapi_dir="${gssapi}/lib"
++     GSSAPIBASE_LIBS="-L$gssapi_dir"
++     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
++  else
++     # FIXME: This is only used for building cyrus, and then only as
++     # a real hack.  it needs to be fixed.
++     gssapi_dir="/usr/local/lib"
++  fi
++
++  # Check a full link against the Heimdal libraries.
++  # If this fails, check a full link against the MIT libraries.
++  # If this fails, check a full link against the CyberSafe libraries.
++  # If this fails, check a full link against the Solaris 8 and up libgss.
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6
++if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gssapi_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gssapi_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6
++if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
++  gss_impl="heimdal"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6
++if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gssapi_krb5_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gssapi_krb5_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6
++if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
++  gss_impl="mit"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  # For Cybersafe one has to set a platform define in order to make compilation work
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
++# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
++    if test -d "${gssapi}/appsec-rt/lib"; then
++      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
++    fi
++    CPPFLAGS="$CPPFLAGS -D$platform"
++    if test -d "${gssapi}/appsec-sdk/include"; then
++      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++    fi
++
++    gss_failed=0
++
++# Check for CyberSafe with two libraries first, than fall back to a single 
++# library (older CyberSafe)
++
++    unset ac_cv_lib_gss_csf_gss_acq_user
++    echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char csf_gss_acq_user ();
++int
++main ()
++{
++csf_gss_acq_user ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_csf_gss_acq_user=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_csf_gss_acq_user=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
++if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++  gss_impl="cybersafe03"
++else
++  unset ac_cv_lib_gss_csf_gss_acq_user;
++                  echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char csf_gss_acq_user ();
++int
++main ()
++{
++csf_gss_acq_user ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_csf_gss_acq_user=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_csf_gss_acq_user=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
++if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++  gss_impl="cybersafe"
++else
++  gss_failed=1
++fi
++
++fi
++
++
++    if test "$gss_failed" = "1"; then
++# Restore variables
++      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
++      CPPFLAGS=$cmu_saved_CPPFLAGS
++
++      if test "$gss_impl" != "auto"; then
++        gss_impl="failed"
++      fi
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss -lgss $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6
++if test $ac_cv_lib_gss_gss_unwrap = yes; then
++  gss_impl="seam"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "mit"; then
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++  elif test "$gss_impl" = "heimdal"; then
++    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++  elif test "$gss_impl" = "cybersafe03"; then
++# Version of CyberSafe with two libraries
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "cybersafe"; then
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "seam"; then
++    GSSAPIBASE_LIBS=-lgss
++    # there is no static libgss on Solaris 8 and up
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "failed"; then
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - specified library not found" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
++  else
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no library" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
++  fi
++fi
++
++#
++# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
++# in gssapi\rfckrb5.h
++#
++if test "$gssapi" != "no"; then
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
++                    hostbased_service_gss_nt_yes
++                  #endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++else
++  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
++echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++fi
++rm -f conftest*
++
++
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  fi
++
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_USER_NAME
++                   user_name_yes_gss_nt
++                  #endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++else
++  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
++echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  fi
++fi
++
++GSSAPI_LIBS=""
++echo "$as_me:$LINENO: checking GSSAPI" >&5
++echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6
++if test "$gssapi" != no; then
++  echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
++echo "${ECHO_T}with implementation ${gss_impl}" >&6
++  echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
++fi
++
++  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
++  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
++
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  
++for ac_func in gsskrb5_register_acceptor_identity
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++  LIBS="$cmu_save_LIBS"
++else
++  echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6
++fi
++
++
++
++
++
++
++# Check whether --with-sasl or --without-sasl was given.
++if test "${with_sasl+set}" = set; then
++  withval="$with_sasl"
++  with_sasl="$withval"
++else
++  with_sasl="yes"
++fi; 
++
++
++# Check whether --with-staticsasl or --without-staticsasl was given.
++if test "${with_staticsasl+set}" = set; then
++  withval="$with_staticsasl"
++  with_staticsasl="$withval";
++             if test $with_staticsasl != "no"; then
++               using_static_sasl="static"
++             fi
++else
++  with_staticsasl="no"; using_static_sasl="no"
++fi; 
++
++SASLFLAGS=""
++LIB_SASL=""
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++cmu_saved_LDFLAGS=$LDFLAGS
++cmu_saved_LIBS=$LIBS
++
++if test ${with_staticsasl} != "no"; then
++  if test -d ${with_staticsasl}; then
++    if test -d ${with_staticsasl}/lib64 ; then
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
++    else
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    fi
++    ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    ac_cv_sasl_where_inc=${with_staticsasl}/include
++
++    SASLFLAGS="-I$ac_cv_sasl_where_inc"
++    LIB_SASL="-L$ac_cv_sasl_where_lib"
++    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++  else
++    with_staticsasl="/usr"
++  fi
++
++  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/sasl.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/sasl.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_sasl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++
++fi
++if test $ac_cv_header_sasl_sasl_h = yes; then
++  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/saslutil.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/saslutil.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++
++fi
++if test $ac_cv_header_sasl_saslutil_h = yes; then
++  for i42 in lib64 lib; do
++                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
++                                        ac_cv_found_sasl=yes
++                                        echo "$as_me:$LINENO: checking for static libsasl" >&5
++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
++                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
++                                      fi
++                                    done
++                                    if test ! "$ac_cv_found_sasl" = "yes"; then
++                                      echo "$as_me:$LINENO: checking for static libsasl" >&5
++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
++                                      { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
++echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
++   { (exit 1); exit 1; }; }
++                                    fi
++fi
++
++
++fi
++
++
++
++  echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6
++
++  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
++    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
++  else
++    SASL_GSSAPI_LIBS_SET=""
++    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
++  fi
++fi
++
++if test -d ${with_sasl}; then
++  ac_cv_sasl_where_lib=${with_sasl}/lib
++  ac_cv_sasl_where_inc=${with_sasl}/include
++
++  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
++  else
++	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
++  fi
++
++  fi
++  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
++  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++fi
++
++# be sure to check for a SASLv2 specific function
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/sasl.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/sasl.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_sasl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++
++fi
++if test $ac_cv_header_sasl_sasl_h = yes; then
++  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/saslutil.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/saslutil.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++
++fi
++if test $ac_cv_header_sasl_saslutil_h = yes; then
++  echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
++echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6
++if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsasl2  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char prop_get ();
++int
++main ()
++{
++prop_get ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_sasl2_prop_get=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_sasl2_prop_get=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
++echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6
++if test $ac_cv_lib_sasl2_prop_get = yes; then
++  ac_cv_found_sasl=yes
++else
++  ac_cv_found_sasl=no
++fi
++
++else
++  ac_cv_found_sasl=no
++fi
++
++
++else
++  ac_cv_found_sasl=no
++fi
++
++
++
++if test "$ac_cv_found_sasl" = "yes"; then
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
++  else
++	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
++  fi
++
++  fi
++  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
++  if test "$using_static_sasl" != "static"; then
++    LIB_SASL=$DYNLIB_SASL
++    SASLFLAGS=$DYNSASLFLAGS
++  fi
++else
++  DYNLIB_SASL=""
++  DYNSASLFLAGS=""
++  using_static_sasl="staticonly"
++fi
++
++if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
++  SASL_GSSAPI_LIBS_SET=""
++  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
++fi
++
++LIBS="$cmu_saved_LIBS"
++LDFLAGS="$cmu_saved_LDFLAGS"
++CPPFLAGS="$cmu_saved_CPPFLAGS"
++
++
++
++
++
++
++
++if test "$ac_cv_found_sasl" != "yes"; then
++  { { echo "$as_me:$LINENO: error: Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&5
++echo "$as_me: error: Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS $SASLFLAGS"
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sasl/sasl.h>
++
++#ifndef SASL_VERSION_MAJOR
++#error SASL_VERSION_MAJOR not defined
++#endif
++#ifndef SASL_VERSION_MINOR
++#error SASL_VERSION_MINOR not defined
++#endif
++#ifndef SASL_VERSION_STEP
++#error SASL_VERSION_STEP not defined
++#endif
++
++#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
++#error SASL version is less than 2.1.7
++#endif
++
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  { { echo "$as_me:$LINENO: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&5
++echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f conftest.err conftest.$ac_ext
++
++CPPFLAGS=$cmu_saved_CPPFLAGS
++
++
++
++cmu_saved_LDFLAGS=$LDFLAGS
++
++LDFLAGS="$LDFLAGS $LIB_SASL"
++
++echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
++echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6
++if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsasl2  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sasl_checkapop ();
++int
++main ()
++{
++sasl_checkapop ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_sasl2_sasl_checkapop=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_sasl2_sasl_checkapop=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
++echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6
++if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_APOP 
++_ACEOF
++
++else
++  { { echo "$as_me:$LINENO: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&5
++echo "$as_me: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++LDFLAGS=$cmu_saved_LDFLAGS
++
++
++
++# Check whether --with-perl or --without-perl was given.
++if test "${with_perl+set}" = set; then
++  withval="$with_perl"
++  with_perl="$withval"
++else
++  with_perl="perl"
++fi; 
++
++if test "${with_perl}" = yes; then
++    with_perl="perl"
++fi
++if test "${with_perl}" != no; then
++    if test ${using_static_sasl} = "staticonly"; then
++	{ echo "$as_me:$LINENO: WARNING: Cannot compile perl utilities using static libsasl" >&5
++echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
++	with_perl="no"
++    else 
++	for ac_prog in ${with_perl} perl
++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_PERL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$PERL"; then
++  ac_cv_prog_PERL="$PERL" # 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_PERL="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++PERL=$ac_cv_prog_PERL
++if test -n "$PERL"; then
++  echo "$as_me:$LINENO: result: $PERL" >&5
++echo "${ECHO_T}$PERL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$PERL" && break
++done
++test -n "$PERL" || PERL="with_perl=notfound"
++
++    fi
++fi
++if test "$with_perl" = "notfound"; then
++    { echo "$as_me:$LINENO: WARNING: Perl not found: Administrative tools won't be available" >&5
++echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
++elif test "${with_perl}" != "no"; then
++    EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
++    PERL_SUBDIRS="imap"
++    PERL="${with_perl}"
++    PERL_CCCDLFLAGS="$cccdlflags"
++    
++fi
++
++if test "$sievedir" != "no"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
++
++	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
++	PERL_DEPSUBDIRS="sieve"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
++else
++	PERL_DEPSUBDIRS="none"
++fi
++
++echo "$as_me:$LINENO: checking for MD5Init" >&5
++echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
++if test "${ac_cv_func_MD5Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define MD5Init to an innocuous variant, in case <limits.h> declares MD5Init.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define MD5Init innocuous_MD5Init
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char MD5Init (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef MD5Init
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char MD5Init ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_MD5Init) || defined (__stub___MD5Init)
++choke me
++#else
++char (*f) () = MD5Init;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != MD5Init;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_MD5Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_MD5Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
++echo "${ECHO_T}$ac_cv_func_MD5Init" >&6
++if test $ac_cv_func_MD5Init = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
++echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6
++if test "${ac_cv_lib_md_MD5Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmd  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char MD5Init ();
++int
++main ()
++{
++MD5Init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_md_MD5Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_md_MD5Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
++echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6
++if test $ac_cv_lib_md_MD5Init = yes; then
++  LIBS="${LIBS} -lmd"
++else
++  MD5OBJ="md5.o"
++fi
++
++fi
++
++
++
++SNMP_SUBDIRS=""
++
++
++
++# Check whether --with-lib-subdir or --without-lib-subdir was given.
++if test "${with_lib_subdir+set}" = set; then
++  withval="$with_lib_subdir"
++  
++fi; 
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
++echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6
++if test "${ac_cv_cmu_lib_subdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
++test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
++if test "X$with_lib_subdir" = "X" ; then
++  ac_cv_cmu_lib_subdir=lib
++  if test $ac_cv_sizeof_long -eq 4 ; then
++    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
++  fi
++  if test $ac_cv_sizeof_long -eq 8 ; then
++    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
++  fi
++else
++  ac_cv_cmu_lib_subdir=$with_lib_subdir
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
++echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6
++CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
++
++
++
++
++  
++  
++# Check whether --with-libwrap or --without-libwrap was given.
++if test "${with_libwrap+set}" = set; then
++  withval="$with_libwrap"
++  with_libwrap=$withval
++else
++  with_libwrap=yes
++fi; 
++  if test "$with_libwrap" != no; then
++    if test -d "$with_libwrap"; then
++      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
++      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
++    fi
++    cmu_save_LIBS="$LIBS"
++    echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
++echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6
++if test "${ac_cv_lib_wrap_request_init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lwrap ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char request_init ();
++int
++main ()
++{
++request_init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_wrap_request_init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_wrap_request_init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
++echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6
++if test $ac_cv_lib_wrap_request_init = yes; then
++  
++		 if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for tcpd.h" >&5
++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
++if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking tcpd.h usability" >&5
++echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <tcpd.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking tcpd.h presence" >&5
++echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <tcpd.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: tcpd.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for tcpd.h" >&5
++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
++if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_tcpd_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
++
++fi
++if test $ac_cv_header_tcpd_h = yes; then
++  :
++else
++  with_libwrap=no
++fi
++
++
++else
++  with_libwrap=no
++fi
++
++    LIBS="$cmu_save_LIBS"
++  fi
++  echo "$as_me:$LINENO: checking libwrap support" >&5
++echo $ECHO_N "checking libwrap support... $ECHO_C" >&6
++  echo "$as_me:$LINENO: result: $with_libwrap" >&5
++echo "${ECHO_T}$with_libwrap" >&6
++  LIB_WRAP=""
++  if test "$with_libwrap" != no; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LIBWRAP 
++_ACEOF
++
++    LIB_WRAP="-lwrap"
++    echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
++echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yp_get_default_domain ();
++int
++main ()
++{
++yp_get_default_domain ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_nsl_yp_get_default_domain=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_yp_get_default_domain=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
++if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
++  LIB_WRAP="${LIB_WRAP} -lnsl"
++fi
++
++  fi
++  
++
++
++
++  
++  
++# Check whether --with-snmp or --without-snmp was given.
++if test "${with_snmp+set}" = set; then
++  withval="$with_snmp"
++  with_snmp=$withval
++else
++  with_snmp=yes
++fi; 
++
++        
++# Check whether --with-ucdsnmp or --without-ucdsnmp was given.
++if test "${with_ucdsnmp+set}" = set; then
++  withval="$with_ucdsnmp"
++  with_snmp=$withval
++fi; 
++
++if test "$with_snmp" != "no"; then
++
++        if test "$with_snmp" = "yes"; then
++    # Extract the first word of "net-snmp-config", so it can be a program name with args.
++set dummy net-snmp-config; 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_path_SNMP_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $SNMP_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy="/usr/local/bin:$PATH"
++for as_dir in $as_dummy
++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_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
++
++if test -n "$SNMP_CONFIG"; then
++  echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
++echo "${ECHO_T}$SNMP_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
++  fi
++
++  if test -x "$SNMP_CONFIG"; then
++    echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
++echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6
++
++    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
++    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
++
++    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
++      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
++      LIB_UCDSNMP=$SNMP_LIBS
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NETSNMP 1
++_ACEOF
++
++      
++      echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++    else
++      echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
++echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
++    fi
++  else
++                if test "$with_snmp" != no; then
++      if test -d "$with_snmp"; then
++        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
++        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
++      fi
++      cmu_save_LIBS="$LIBS"
++      echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
++echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6
++if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sprint_objid ();
++int
++main ()
++{
++sprint_objid ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_snmp_sprint_objid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_snmp_sprint_objid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
++echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6
++if test $ac_cv_lib_snmp_sprint_objid = yes; then
++  
++  		 if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
++if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
++echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <ucd-snmp/version.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
++echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ucd-snmp/version.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
++if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
++
++fi
++if test $ac_cv_header_ucd_snmp_version_h = yes; then
++  :
++else
++  with_snmp=no
++fi
++
++
++else
++  with_snmp=no
++fi
++
++      LIBS="$cmu_save_LIBS"
++    fi
++    echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
++echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6
++    echo "$as_me:$LINENO: result: $with_snmp" >&5
++echo "${ECHO_T}$with_snmp" >&6
++    LIB_UCDSNMP=""
++    if test "$with_snmp" != no; then
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_UCDSNMP 1
++_ACEOF
++
++      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++      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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrpm -lpopt $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char rpmdbOpen ();
++int
++main ()
++{
++rpmdbOpen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rpm_rpmdbOpen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rpm_rpmdbOpen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6
++if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
++  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
++fi
++
++    fi
++    
++  fi
++fi
++
++
++
++# Figure out what directories we're linking against.
++# Lots of fun for the whole family.
++# This probably chokes on anything with spaces in it.
++# All we want is the list of -L directories, and -L may or may not be
++# followed by a space.
++isdir=no
++libpath=""
++#echo "debug ldflags: << ${ldflags} >>"
++#echo "debug default_ldflags: << ${default_ldflags} >>"
++for flag in ${ldflags} ${default_ldflags}; do
++  case $flag in
++    -L)
++      # it's a split -L option, we'll mark the next option as a dir.
++      isdir=yes
++      ;;
++
++    -L*) 
++      # attached -L option: split off the directory
++      larg=`echo $flag | sed -e 's:-L\(..*\):\1:'`
++      libpath="${libpath} ${larg}"
++      ;;
++
++    *)
++      if test $isdir = yes ; then
++	libpath="${libpath} ${flag}"
++	isdir=no
++      fi
++  esac
++done
++
++IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
++IMAP_LIBS="${LIB_SASL} ${LIBS}"
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++                                                                                          ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
++_ACEOF
++
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++{
++  (set) 2>&1 |
++    case `(ac_space=' '; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;;
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++} |
++  sed '
++     t clear
++     : clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     : end' >>confcache
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
++  if test -w $cache_file; then
++    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++    cat confcache >$cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/;
++s/:*\${srcdir}:*/:/;
++s/:*@srcdir@:*/:/;
++s/^\([^=]*=[	 ]*\):*/\1/;
++s/:*$//;
++s/^[^=]*=[	 ]*$//;
++}'
++fi
++
++DEFS=-DHAVE_CONFIG_H
++
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIB@&t@OBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++
++: ${CONFIG_STATUS=./config.status}
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate the current configuration.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
++
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# 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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++exec 6>&1
++
++# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.  Logging --version etc. is OK.
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
++@%:@@%:@ Running $as_me. @%:@@%:@
++_ASBOX
++} >&5
++cat >&5 <<_CSEOF
++
++This file was extended by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++_CSEOF
++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
++echo >&5
++_ACEOF
++
++# Files that config.status was made for.
++if test -n "$ac_config_files"; then
++  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_headers"; then
++  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_links"; then
++  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_commands"; then
++  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
++
++Usage: $0 [OPTIONS] [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
++  -d, --debug      don't remove temporary files
++      --recheck    update $as_me by reconfiguring in the same conditions
++  --file=FILE[:TEMPLATE]
++		   instantiate the configuration file FILE
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
++
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Report bugs to <bug-autoconf@gnu.org>."
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++ac_cs_version="\\
++config.status
++configured by $0, generated by GNU Autoconf 2.59,
++  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
++srcdir=$srcdir
++INSTALL="$INSTALL"
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value.  By we need to know if files were specified by the user.
++ac_need_defaults=:
++while test $# != 0
++do
++  case $1 in
++  --*=*)
++    ac_option=`expr "x$1" : 'x\([^=]*\)='`
++    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  *) # This is not an option, so the user has probably given explicit
++     # arguments.
++     ac_option=$1
++     ac_need_defaults=false;;
++  esac
++
++  case $ac_option in
++  # Handling of the options.
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --vers* | -V )
++    echo "$ac_cs_version"; exit 0 ;;
++  --he | --h)
++    # Conflict between --help and --header
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit 0 ;;
++  --debug | --d* | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; } ;;
++
++  *) ac_config_targets="$ac_config_targets $1" ;;
++
++  esac
++  shift
++done
++
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
++_ACEOF
++
++
++
++
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_config_target in $ac_config_targets
++do
++  case "$ac_config_target" in
++  # Handling of arguments.
++  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
++  "master/Makefile" ) CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
++  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
++  "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
++  "imtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
++  "netnews/Makefile" ) CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
++  "perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
++  "$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
++  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++fi
++
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++
++{
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./confstat$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++
++#
++# CONFIG_FILES section.
++#
++
++# No need to generate the scripts if there are no CONFIG_FILES.
++# This happens for instance when ./config.status config.h
++if test -n "\$CONFIG_FILES"; then
++  # Protect against being on the right side of a sed subst in config.status.
++  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@exec_prefix@,$exec_prefix,;t t
++s,@prefix@,$prefix,;t t
++s,@program_transform_name@,$program_transform_name,;t t
++s,@bindir@,$bindir,;t t
++s,@sbindir@,$sbindir,;t t
++s,@libexecdir@,$libexecdir,;t t
++s,@datadir@,$datadir,;t t
++s,@sysconfdir@,$sysconfdir,;t t
++s,@sharedstatedir@,$sharedstatedir,;t t
++s,@localstatedir@,$localstatedir,;t t
++s,@libdir@,$libdir,;t t
++s,@includedir@,$includedir,;t t
++s,@oldincludedir@,$oldincludedir,;t t
++s,@infodir@,$infodir,;t t
++s,@mandir@,$mandir,;t t
++s,@build_alias@,$build_alias,;t t
++s,@host_alias@,$host_alias,;t t
++s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
++s,@ECHO_C@,$ECHO_C,;t t
++s,@ECHO_N@,$ECHO_N,;t t
++s,@ECHO_T@,$ECHO_T,;t t
++s,@LIBS@,$LIBS,;t t
++s,@build@,$build,;t t
++s,@build_cpu@,$build_cpu,;t t
++s,@build_vendor@,$build_vendor,;t t
++s,@build_os@,$build_os,;t t
++s,@host@,$host,;t t
++s,@host_cpu@,$host_cpu,;t t
++s,@host_vendor@,$host_vendor,;t t
++s,@host_os@,$host_os,;t t
++s,@WARNERROR@,$WARNERROR,;t t
++s,@MAKEDEPEND@,$MAKEDEPEND,;t t
++s,@cyrus_prefix@,$cyrus_prefix,;t t
++s,@service_path@,$service_path,;t t
++s,@cyrus_user@,$cyrus_user,;t t
++s,@cyrus_group@,$cyrus_group,;t t
++s,@CC@,$CC,;t t
++s,@CFLAGS@,$CFLAGS,;t t
++s,@LDFLAGS@,$LDFLAGS,;t t
++s,@CPPFLAGS@,$CPPFLAGS,;t t
++s,@ac_ct_CC@,$ac_ct_CC,;t t
++s,@EXEEXT@,$EXEEXT,;t t
++s,@OBJEXT@,$OBJEXT,;t t
++s,@RANLIB@,$RANLIB,;t t
++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++s,@SET_MAKE@,$SET_MAKE,;t t
++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
++s,@AWK@,$AWK,;t t
++s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
++s,@LIB_SOCKET@,$LIB_SOCKET,;t t
++s,@IPV6_OBJS@,$IPV6_OBJS,;t t
++s,@PRE_SUBDIRS@,$PRE_SUBDIRS,;t t
++s,@EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t
++s,@DEPLIBS@,$DEPLIBS,;t t
++s,@LOCALDEFS@,$LOCALDEFS,;t t
++s,@BDB_INC@,$BDB_INC,;t t
++s,@BDB_LIB@,$BDB_LIB,;t t
++s,@CYRUSDB_OBJS@,$CYRUSDB_OBJS,;t t
++s,@SIEVE_OBJS@,$SIEVE_OBJS,;t t
++s,@SIEVE_LIBS@,$SIEVE_LIBS,;t t
++s,@SIEVE_CPPFLAGS@,$SIEVE_CPPFLAGS,;t t
++s,@YACC@,$YACC,;t t
++s,@LEX@,$LEX,;t t
++s,@LEXLIB@,$LEXLIB,;t t
++s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
++s,@SIEVE_SUBDIRS@,$SIEVE_SUBDIRS,;t t
++s,@WITH_NONBLOCK@,$WITH_NONBLOCK,;t t
++s,@WITH_GMTOFF@,$WITH_GMTOFF,;t t
++s,@WITH_MAP@,$WITH_MAP,;t t
++s,@WITH_LOCK@,$WITH_LOCK,;t t
++s,@cyrus_sigveclib@,$cyrus_sigveclib,;t t
++s,@AFS_LIBS@,$AFS_LIBS,;t t
++s,@AFS_LDFLAGS@,$AFS_LDFLAGS,;t t
++s,@LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t
++s,@LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t
++s,@LDAP_LIBS@,$LDAP_LIBS,;t t
++s,@SERVER_SUBDIRS@,$SERVER_SUBDIRS,;t t
++s,@OPENSSL_INC@,$OPENSSL_INC,;t t
++s,@OPENSSL_LIB@,$OPENSSL_LIB,;t t
++s,@ZEPHYR_LIBS@,$ZEPHYR_LIBS,;t t
++s,@ZEPHYR_CPPFLAGS@,$ZEPHYR_CPPFLAGS,;t t
++s,@WITH_IDLE@,$WITH_IDLE,;t t
++s,@IMAP_PROGS@,$IMAP_PROGS,;t t
++s,@COMPILE_ET@,$COMPILE_ET,;t t
++s,@COM_ERR_LIBS@,$COM_ERR_LIBS,;t t
++s,@COM_ERR_LDFLAGS@,$COM_ERR_LDFLAGS,;t t
++s,@COM_ERR_CPPFLAGS@,$COM_ERR_CPPFLAGS,;t t
++s,@LIB_CRYPT@,$LIB_CRYPT,;t t
++s,@GSSAPI_LIBS@,$GSSAPI_LIBS,;t t
++s,@GSSAPIBASE_LIBS@,$GSSAPIBASE_LIBS,;t t
++s,@LIB_DYN_SASL@,$LIB_DYN_SASL,;t t
++s,@DYNSASLFLAGS@,$DYNSASLFLAGS,;t t
++s,@LIB_SASL@,$LIB_SASL,;t t
++s,@SASLFLAGS@,$SASLFLAGS,;t t
++s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
++s,@MD5OBJ@,$MD5OBJ,;t t
++s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
++s,@CMU_LIB_SUBDIR@,$CMU_LIB_SUBDIR,;t t
++s,@LIB_WRAP@,$LIB_WRAP,;t t
++s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
++s,@LIB_UCDSNMP@,$LIB_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
++s,@PERL_SUBDIRS@,$PERL_SUBDIRS,;t t
++s,@PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++CEOF
++
++_ACEOF
++
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  # Split the substitutions into bite-sized pieces for seds with
++  # small command number limits, like on Digital OSF/1 and HP-UX.
++  ac_max_sed_lines=48
++  ac_sed_frag=1 # Number of current file.
++  ac_beg=1 # First line for current file.
++  ac_end=$ac_max_sed_lines # Line after last line for current file.
++  ac_more_lines=:
++  ac_sed_cmds=
++  while $ac_more_lines; do
++    if test $ac_beg -gt 1; then
++      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    else
++      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    fi
++    if test ! -s $tmp/subs.frag; then
++      ac_more_lines=false
++    else
++      # The purpose of the label and of the branching condition is to
++      # speed up the sed processing (if there are no `@' at all, there
++      # is no need to browse any of the substitutions).
++      # These are the two extra sed commands mentioned above.
++      (echo ':t
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++      if test -z "$ac_sed_cmds"; then
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++      else
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++      fi
++      ac_sed_frag=`expr $ac_sed_frag + 1`
++      ac_beg=$ac_end
++      ac_end=`expr $ac_end + $ac_max_sed_lines`
++    fi
++  done
++  if test -z "$ac_sed_cmds"; then
++    ac_sed_cmds=cat
++  fi
++fi # test -n "$CONFIG_FILES"
++
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++  ac_dir=`(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'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  esac
++
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++				     sed 's,.*/,,'` by configure."
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
++$extrasub
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++:t
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++s,@configure_input@,$configure_input,;t t
++s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
++s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
++s,@INSTALL@,$ac_INSTALL,;t t
++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
++  rm -f $tmp/stdin
++  if test x"$ac_file" != x-; then
++    mv $tmp/out $ac_file
++  else
++    cat $tmp/out
++    rm -f $tmp/out
++  fi
++
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_HEADER section.
++#
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
++ac_dC=' '
++ac_dD=',;t'
++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
++ac_uB='$,\1#\2define\3'
++ac_uC=' '
++ac_uD=',;t'
++
++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++  # Remove the trailing spaces.
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
++
++_ACEOF
++
++# Transform confdefs.h into two sed scripts, `conftest.defines' and
++# `conftest.undefs', that substitutes the proper values into
++# config.h.in to produce config.h.  The first handles `#define'
++# templates, and the second `#undef' templates.
++# And first: Protect against being on the right side of a sed subst in
++# config.status.  Protect against being in an unquoted here document
++# in config.status.
++rm -f conftest.defines conftest.undefs
++# Using a here document instead of a string reduces the quoting nightmare.
++# Putting comments in sed scripts is not portable.
++#
++# `end' is used to avoid that the second main sed command (meant for
++# 0-ary CPP macros) applies to n-ary macro definitions.
++# See the Autoconf documentation for `clear'.
++cat >confdef2sed.sed <<\_ACEOF
++s/[\\&,]/\\&/g
++s,[\\$`],\\&,g
++t clear
++: clear
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++t end
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++: end
++_ACEOF
++# If some macros were called several times there might be several times
++# the same #defines, which is useless.  Nevertheless, we may not want to
++# sort them, since we want the *last* AC-DEFINE to be honored.
++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
++rm -f confdef2sed.sed
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >>conftest.undefs <<\_ACEOF
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++_ACEOF
++
++# Break up conftest.defines because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
++echo '  :' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.defines >/dev/null
++do
++  # Write a limited-size here document to $tmp/defines.sed.
++  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#define' lines.
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/defines.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines
++echo '  fi # grep' >>$CONFIG_STATUS
++echo >>$CONFIG_STATUS
++
++# Break up conftest.undefs because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.undefs >/dev/null
++do
++  # Write a limited-size here document to $tmp/undefs.sed.
++  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#undef'
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
++  rm -f conftest.undefs
++  mv conftest.tail conftest.undefs
++done
++rm -f conftest.undefs
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    echo "/* Generated by configure.  */" >$tmp/config.h
++  else
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
++  fi
++  cat $tmp/in >>$tmp/config.h
++  rm -f $tmp/in
++  if test x"$ac_file" != x-; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
++    else
++      ac_dir=`(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'`
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++      rm -f $ac_file
++      mv $tmp/config.h $ac_file
++    fi
++  else
++    cat $tmp/config.h
++    rm -f $tmp/config.h
++  fi
++done
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++{ (exit 0); exit 0; }
++_ACEOF
++chmod +x $CONFIG_STATUS
++ac_clean_files=$ac_clean_files_save
++
++
++# configure is writing to config.log, and then calls config.status.
++# config.status does its own redirection, appending to config.log.
++# Unfortunately, on DOS this fails, as config.log is still kept open
++# by configure, so config.status won't be able to write to it; its
++# output is simply discarded.  So we exec the FD to /dev/null,
++# effectively closing config.log, so it can be properly (re)opened and
++# appended to by config.status.  When coming back to configure, we
++# need to make the FD available again.
++if test "$no_create" != yes; then
++  ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
++  exec 5>/dev/null
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
++  exec 5>>config.log
++  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
++  # would make configure fail if this is the last instruction.
++  $ac_cs_success || { (exit 1); exit 1; }
++fi
++
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1
+--- cyrus-imapd-2.2.13/autom4te.cache/output.1	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1	2006-05-19 15:21:21.133751010 +0200
+@@ -0,0 +1,18693 @@
++@%:@! /bin/sh
++@%:@ Guess values for system-dependent variables and create Makefiles.
++@%:@ Generated by GNU Autoconf 2.59.
++@%:@ 
++@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
++@%:@ This configure script is free software; the Free Software Foundation
++@%:@ gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# 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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="imap/imapd.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR 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 LIB@&t@OBJS 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 WITH_IDLE 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 CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_files=''
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++ac_prev=
++for ac_option
++do
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case $ac_option in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir=$ac_optarg ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build_alias ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build_alias=$ac_optarg ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir=$ac_optarg ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_$ac_feature='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix=$ac_optarg ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host_alias ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host_alias=$ac_optarg ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir=$ac_optarg ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir=$ac_optarg ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir=$ac_optarg ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir=$ac_optarg ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir=$ac_optarg ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir=$ac_optarg ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c | -n)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir=$ac_optarg ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix=$ac_optarg ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix=$ac_optarg ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix=$ac_optarg ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name=$ac_optarg ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir=$ac_optarg ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir=$ac_optarg ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site=$ac_optarg ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir=$ac_optarg ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir=$ac_optarg ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target_alias ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target_alias=$ac_optarg ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
++
++  -with-* | --with-*)
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_$ac_package='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes=$ac_optarg ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries=$ac_optarg ;;
++
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
++    ;;
++
++  *=*)
++    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
++  *)
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used." >&2
++  elif test "x$build_alias" != "x$host_alias"; then
++    cross_compiling=yes
++  fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$0" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
++  else
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++  fi
++fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++for instance \`--prefix=\$HOME'.
++
++For better control, use the options below.
++
++Fine tuning of the installation directories:
++  --bindir=DIR           user executables [EPREFIX/bin]
++  --sbindir=DIR          system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR       program executables [EPREFIX/libexec]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
++  --libdir=DIR           object code libraries [EPREFIX/lib]
++  --includedir=DIR       C header files [PREFIX/include]
++  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++
++System types:
++  --build=BUILD     configure for building on BUILD [guessed]
++  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-warnings-are-errors   add -Werror to most gcc calls
++  --disable-sieve         disable Sieve support
++  --enable-krb5afspts     compile afskrb PTS module with krb5 support
++  --disable-server        disable compiling servers
++  --enable-statickrb      link Kerberos statically
++  --enable-nntp           enable NNTP support (experimental)
++  --enable-murder         enable IMAP Murder support
++  --enable-cmulocal       enable CMU-specific local support
++  --enable-oldsievename   enable the use of 'imap' as the sieve service name
++  --enable-listext        enable IMAP List extensions
++  --enable-netscapehack   enable Netscape hack for the menu option
++                          in Communicator to Administrate Mail
++  --enable-gssapi=<DIR>   enable GSSAPI authentication [yes]
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-extraident=STRING   use STRING as extra version information
++
++  --with-cyrus-prefix=DIR    use DIR as cyrus server install directory
++  --with-service-path=DIR    use DIR as service install directory
++  --with-cyrus-user=USERID   use USERID cyrus userid
++  --with-cyrus-group=GROUPID use GROUPID cyrus group
++  --with-bdb=DIR          use Berkeley DB (in DIR) [yes] 
++  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR
++  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR
++  --with-lock=METHOD      force use of METHOD for locking (flock or fcntl)
++  --with-afs=PATH         use AFS libraries from PATH
++  --with-ldap=DIR         use LDAP (in DIR) (experimental) /usr/local 
++  --with-krb=PATH         use Kerberos from PATH
++  --with-krbimpl=\kth|mit\         assume Kerberos 4 from KTH or MIT
++  --with-krbdes           use Kerberos DES implementation [yes]
++  --with-openssl=PATH     use OpenSSL from PATH
++  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
++                          for systems without /dev/urandom
++  --with-zephyr=PATH    enable Zephyr notification (installed on PATH)
++  --with-pidfile=PATH   pidfile in PATH (/var/run/cyrus-master.pid)
++  --with-idle=METHOD      use METHOD for IMAP IDLE
++                          METHOD is poll, idled or no
++  --with-com_err=PATH     use com_err from path -- includes in PATH/include,
++                          libs in PATH/lib, and compile_et in PATH/bin
++  --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
++  --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
++                          choose specific GSSAPI implementation [[auto]]
++  --with-sasl=DIR         Compile with libsasl2 in <DIR>
++  --with-staticsasl=DIR   Compile with staticly linked libsasl2 in <DIR>
++  --with-perl=PERL        use PERL for perl
++  --with-lib-subdir=DIR   Find libraries in DIR instead of lib
++  --with-libwrap=DIR      use libwrap (rooted in DIR) yes 
++  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) yes 
++
++Some influential environment variables:
++  CC          C compiler command
++  CFLAGS      C compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd "$ac_popdir"
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++@%:@@%:@ --------- @%:@@%:@
++@%:@@%:@ Platform. @%:@@%:@
++@%:@@%:@ --------- @%:@@%:@
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ Core tests. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ---------------- @%:@@%:@
++@%:@@%:@ Cache variables. @%:@@%:@
++@%:@@%:@ ---------------- @%:@@%:@
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ----------------- @%:@@%:@
++@%:@@%:@ Output variables. @%:@@%:@
++@%:@@%:@ ----------------- @%:@@%:@
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++@%:@@%:@ ------------- @%:@@%:@
++@%:@@%:@ Output files. @%:@@%:@
++@%:@@%:@ ------------- @%:@@%:@
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ confdefs.h. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
++    sed 's/^/| /' "$ac_site_file" >&5
++    . "$ac_site_file"
++  fi
++done
++
++if test -r "$cache_file"; then
++  # Some versions of bash will fail to source /dev/null (special
++  # files actually), so we avoid doing that.
++  if test -f "$cache_file"; then
++    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
++    case $cache_file in
++      [\\/]* | ?:[\\/]* ) . $cache_file;;
++      *)                      . ./$cache_file;;
++    esac
++  fi
++else
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++  >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,set)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
++echo "$as_me:   former value:  $ac_old_val" >&2;}
++	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
++echo "$as_me:   current value: $ac_new_val" >&2;}
++	ac_cache_corrupted=:
++      fi;;
++  esac
++  # Pass precious variables to config.status.
++  if test "$ac_new_set" = set; then
++    case $ac_new_val in
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++          ac_config_headers="$ac_config_headers config.h"
++
++ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
++echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++   { (exit 1); exit 1; }; }
++
++echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++   { (exit 1); exit 1; }; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++
++WARNERROR=-W
++# Check whether --enable-warnings-are-errors or --disable-warnings-are-errors was given.
++if test "${enable_warnings_are_errors+set}" = set; then
++  enableval="$enable_warnings_are_errors"
++   if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi 
++fi; 
++
++
++
++# Check whether --with-extraident or --without-extraident was given.
++if test "${with_extraident+set}" = set; then
++  withval="$with_extraident"
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define EXTRA_IDENT "$withval"
++_ACEOF
++
++fi; 
++
++# Extract the first word of "makedepend", so it can be a program name with args.
++set dummy makedepend; 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_MAKEDEPEND+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$MAKEDEPEND"; then
++  ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # 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_MAKEDEPEND="makedepend"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
++fi
++fi
++MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
++if test -n "$MAKEDEPEND"; then
++  echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
++echo "${ECHO_T}$MAKEDEPEND" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test "$MAKEDEPEND" != "makedepend"; then
++        { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
++echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
++fi
++
++
++# Check whether --with-login or --without-login was given.
++if test "${with_login+set}" = set; then
++  withval="$with_login"
++  { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
++Configure SASL appropriately instead." >&5
++echo "$as_me: error: --with-login is no longer supported.
++Configure SASL appropriately instead." >&2;}
++   { (exit 1); exit 1; }; }
++fi; 
++
++
++# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given.
++if test "${with_cyrus_prefix+set}" = set; then
++  withval="$with_cyrus_prefix"
++  cyrus_prefix="$withval"
++else
++  cyrus_prefix="/usr/cyrus"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define CYRUS_PATH "$cyrus_prefix"
++_ACEOF
++
++
++# Check whether --with-service-path or --without-service-path was given.
++if test "${with_service_path+set}" = set; then
++  withval="$with_service_path"
++  service_path="$withval"
++else
++  service_path="$cyrus_prefix/bin"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SERVICE_PATH "$service_path"
++_ACEOF
++
++
++# Check whether --with-cyrus-user or --without-cyrus-user was given.
++if test "${with_cyrus_user+set}" = set; then
++  withval="$with_cyrus_user"
++  cyrus_user="$withval"
++else
++  cyrus_user="cyrus"
++fi; 
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define CYRUS_USER "$cyrus_user"
++_ACEOF
++
++
++# Check whether --with-cyrus-group or --without-cyrus-group was given.
++if test "${with_cyrus_group+set}" = set; then
++  withval="$with_cyrus_group"
++  cyrus_group="$withval"
++else
++  cyrus_group="mail"
++fi; 
++
++
++if test $sysconfdir = '${prefix}/etc'; then
++  sysconfdir="/etc"
++fi
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SYSCONFDIR "$sysconfdir"
++_ACEOF
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++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
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $@%:@ != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++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_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  fi
++fi
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cc_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++@%:@ifndef __cplusplus
++  choke me
++@%:@endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; 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_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
++    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_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++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_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftest.make
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++# 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:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# OS/2's system install, which has a completely different semantic
++# ./install, which can be erroneously created by make from ./install.sh.
++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++  ./ | .// | /cC/* | \
++  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  /usr/ucb/* ) ;;
++  *)
++    # OSF1 and SCO ODT 3.0 have their own names for install.
++    # Don't use installbsd from OSF since it installs stuff as root
++    # by default.
++    for ac_prog in ginstall scoinst install; do
++      for ac_exec_ext in '' $ac_executable_extensions; do
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
++      done
++    done
++    ;;
++esac
++done
++
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++  
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++ 
++
++
++echo "$as_me:$LINENO: checking for AIX" >&5
++echo $ECHO_N "checking for AIX... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef _AIX
++  yes
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++cat >>confdefs.h <<\_ACEOF
++@%:@define _ALL_SOURCE 1
++_ACEOF
++
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++rm -f conftest*
++
++
++echo "$as_me:$LINENO: checking for library containing strerror" >&5
++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
++if test "${ac_cv_search_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_strerror=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_strerror="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_strerror" = no; then
++  for ac_lib in cposix; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_strerror="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++echo "${ECHO_T}$ac_cv_search_strerror" >&6
++if test "$ac_cv_search_strerror" != no; then
++  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
++  
++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 for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6
++if test $ac_cv_header_stdc = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6
++if test "${ac_cv_type_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long long int *) 0)
++  return 0;
++if (sizeof (long long int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of long long int" >&5
++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long_long_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long long int)); }
++unsigned long ulongval () { return (long) (sizeof (long long int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long long int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for unsigned long long int" >&5
++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((unsigned long long int *) 0)
++  return 0;
++if (sizeof (unsigned long long int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_unsigned_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_unsigned_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of unsigned long long int" >&5
++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (unsigned long long int)); }
++unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (unsigned long long int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (unsigned long long int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (unsigned long long int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_unsigned_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++_ACEOF
++
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LONG_LONG_INT 
++_ACEOF
++
++  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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic (); 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++int
++main ()
++{
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++  yes)
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++fi
++
++
++echo "$as_me:$LINENO: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
++if test "${ac_cv___attribute__+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv___attribute__=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv___attribute__=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++if test "$ac_cv___attribute__" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++
++echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
++echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
++if test "${ac_cv_fpic+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++save_CFLAGS=$CFLAGS
++CFLAGS="${CFLAGS} -fPIC"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_fpic=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_fpic=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_CFLAGS
++
++fi
++
++if test "$ac_cv_fpic" = "yes"; then
++    FPIC_CFLAGS="-fPIC"
++else
++    FPIC_CFLAGS=""
++fi
++echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
++echo "${ECHO_T}$ac_cv_fpic" >&6
++
++
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++
++
++   # CMU GUESS RUNPATH SWITCH
++    andrew_runpath_switch="none"
++
++
++
++
++
++
++for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++
++
++for ac_func in memmove strcasecmp ftruncate strerror
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++else
++  case $LIB@&t@OBJS in
++    "$ac_func.$ac_objext"   | \
++  *" $ac_func.$ac_objext"   | \
++    "$ac_func.$ac_objext "* | \
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS $ac_func.$ac_objext" ;;
++esac
++
++fi
++done
++
++
++
++
++for ac_func in strlcat strlcpy
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++
++
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_hdr>
++
++int
++main ()
++{
++if ((DIR *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++_ACEOF
++
++ac_header_dirent=$ac_hdr; break
++fi
++
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in dir; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++  
++fi
++
++else
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in x; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++  
++fi
++
++fi
++
++
++
++	save_LIBS="$LIBS"
++	LIB_SOCKET=""
++	echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6
++if test "${ac_cv_func_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define connect to an innocuous variant, in case <limits.h> declares connect.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define connect innocuous_connect
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char connect (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef connect
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_connect) || defined (__stub___connect)
++choke me
++#else
++char (*f) () = connect;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != connect;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6
++if test $ac_cv_func_connect = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostbyname ();
++int
++main ()
++{
++gethostbyname ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_nsl_gethostbyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
++  LIB_SOCKET="-lnsl $LIB_SOCKET"
++fi
++
++		echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++int
++main ()
++{
++connect ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++if test $ac_cv_lib_socket_connect = yes; then
++  LIB_SOCKET="-lsocket $LIB_SOCKET"
++fi
++
++	
++fi
++
++	LIBS="$LIB_SOCKET $save_LIBS"
++	echo "$as_me:$LINENO: checking for res_search" >&5
++echo $ECHO_N "checking for res_search... $ECHO_C" >&6
++if test "${ac_cv_func_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define res_search to an innocuous variant, in case <limits.h> declares res_search.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define res_search innocuous_res_search
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char res_search (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef res_search
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_res_search) || defined (__stub___res_search)
++choke me
++#else
++char (*f) () = res_search;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != res_search;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
++echo "${ECHO_T}$ac_cv_func_res_search" >&6
++if test $ac_cv_func_res_search = yes; then
++  :
++else
++  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#endif
++#include <resolv.h>
++int
++main ()
++{
++
++const char host[12]="openafs.org";
++u_char ans[1024];
++res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
++return 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  LIB_SOCKET="-lresolv $LIB_SOCKET"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        
++fi
++
++	LIBS="$LIB_SOCKET $save_LIBS"
++	
++
++for ac_func in dn_expand dns_lookup
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++	LIBS="$save_LIBS"
++	
++	
++LIBS="$LIBS ${LIB_SOCKET}"
++
++cyrus_cv_getaddrinfo=yes
++
++echo "$as_me:$LINENO: checking for getaddrinfo" >&5
++echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
++if test "${ac_cv_func_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getaddrinfo innocuous_getaddrinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getaddrinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getaddrinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
++choke me
++#else
++char (*f) () = getaddrinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getaddrinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
++if test $ac_cv_func_getaddrinfo = yes; then
++    ac_cv_lib_socket_getaddrinfo=no
++  ac_cv_lib_inet6_getaddrinfo=no
++
++else
++    echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
++echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++int
++main ()
++{
++getaddrinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6
++if test $ac_cv_lib_socket_getaddrinfo = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getaddrinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
++echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getaddrinfo ();
++int
++main ()
++{
++getaddrinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_getaddrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_getaddrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6
++if test $ac_cv_lib_inet6_getaddrinfo = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_getaddrinfo=no
++if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
++     -o $ac_cv_lib_inet6_getaddrinfo = yes
++then
++  ipv6_cv_getaddrinfo=yes
++fi
++if test $ipv6_cv_getaddrinfo = no; then
++  if test getaddrinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getaddrinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}getaddrinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}getaddrinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}getaddrinfo) || defined (__stub___${ipv6_cv_pfx}getaddrinfo)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}getaddrinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}getaddrinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_getaddrinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getaddrinfo = yes; then
++  
++echo "$as_me:$LINENO: checking for gai_strerror" >&5
++echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
++if test "${ac_cv_func_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gai_strerror innocuous_gai_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gai_strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gai_strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror)
++choke me
++#else
++char (*f) () = gai_strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gai_strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6
++if test $ac_cv_func_gai_strerror = yes; then
++    ac_cv_lib_socket_gai_strerror=no
++  ac_cv_lib_inet6_gai_strerror=no
++
++else
++    echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
++echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++int
++main ()
++{
++gai_strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6
++if test $ac_cv_lib_socket_gai_strerror = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_gai_strerror=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
++echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gai_strerror ();
++int
++main ()
++{
++gai_strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_gai_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_gai_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6
++if test $ac_cv_lib_inet6_gai_strerror = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_gai_strerror=no
++if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
++     -o $ac_cv_lib_inet6_gai_strerror = yes
++then
++  ipv6_cv_gai_strerror=yes
++fi
++if test $ipv6_cv_gai_strerror = no; then
++  if test gai_strerror = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}gai_strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}gai_strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}gai_strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}gai_strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}gai_strerror) || defined (__stub___${ipv6_cv_pfx}gai_strerror)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}gai_strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}gai_strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_gai_strerror=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_gai_strerror = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++else
++  cyrus_cv_getaddrinfo=no
++fi
++else
++  cyrus_cv_getaddrinfo=no
++fi
++
++if test $cyrus_cv_getaddrinfo = no; then
++	IPV6_OBJS="getaddrinfo.o"
++fi
++
++cyrus_cv_getnameinfo=yes
++
++echo "$as_me:$LINENO: checking for getnameinfo" >&5
++echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
++if test "${ac_cv_func_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getnameinfo innocuous_getnameinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getnameinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getnameinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo)
++choke me
++#else
++char (*f) () = getnameinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getnameinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6
++if test $ac_cv_func_getnameinfo = yes; then
++    ac_cv_lib_socket_getnameinfo=no
++  ac_cv_lib_inet6_getnameinfo=no
++
++else
++    echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
++echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++int
++main ()
++{
++getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6
++if test $ac_cv_lib_socket_getnameinfo = yes; then
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
++  
++else
++      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
++    if test "${ipv6_cv_dir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
++echo "${ECHO_T}$ipv6_cv_dir" >&6
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getnameinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
++echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6
++if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getnameinfo ();
++int
++main ()
++{
++getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_inet6_getnameinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_inet6_getnameinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6
++if test $ac_cv_lib_inet6_getnameinfo = yes; then
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
++
++fi
++ipv6_cv_getnameinfo=no
++if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
++     -o $ac_cv_lib_inet6_getnameinfo = yes
++then
++  ipv6_cv_getnameinfo=yes
++fi
++if test $ipv6_cv_getnameinfo = no; then
++  if test getnameinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
++  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
++echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getnameinfo.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ${ipv6_cv_pfx}getnameinfo (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ${ipv6_cv_pfx}getnameinfo
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ${ipv6_cv_pfx}getnameinfo ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_${ipv6_cv_pfx}getnameinfo) || defined (__stub___${ipv6_cv_pfx}getnameinfo)
++choke me
++#else
++char (*f) () = ${ipv6_cv_pfx}getnameinfo;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ${ipv6_cv_pfx}getnameinfo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++
++fi
++rm -f conftest*
++
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++
++        ipv6_cv_getnameinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getnameinfo = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETNAMEINFO 
++_ACEOF
++
++else
++  cyrus_cv_getnameinfo=no
++fi
++
++if test $cyrus_cv_getnameinfo = no; then
++	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++fi
++
++
++echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
++echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6
++if test "${ipv6_cv_ss_family+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr_storage ss; int i = ss.ss_family;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ipv6_cv_ss_family=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ipv6_cv_ss_family=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test $ipv6_cv_ss_family = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SS_FAMILY 
++_ACEOF
++
++else
++  :
++fi
++echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
++echo "${ECHO_T}$ipv6_cv_ss_family" >&6
++
++echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
++echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6
++if test "${ipv6_cv_sa_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr sa; int i = sa.sa_len;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ipv6_cv_sa_len=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ipv6_cv_sa_len=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test $ipv6_cv_sa_len = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SOCKADDR_SA_LEN 
++_ACEOF
++
++else
++  :
++fi
++echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
++echo "${ECHO_T}$ipv6_cv_sa_len" >&6
++
++
++
++
++for ac_header in sys/time.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_time=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_time=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6
++if test $ac_cv_header_time = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TIME_WITH_SYS_TIME 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
++if test "${ac_cv_struct_tm+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <time.h>
++
++int
++main ()
++{
++struct tm *tp; tp->tm_sec;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_struct_tm=time.h
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_struct_tm=sys/time.h
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
++echo "${ECHO_T}$ac_cv_struct_tm" >&6
++if test $ac_cv_struct_tm = sys/time.h; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TM_IN_SYS_TIME 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
++echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
++if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++
++int
++main ()
++{
++static struct tm ac_aggr;
++if (ac_aggr.tm_zone)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_tm_tm_zone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++
++int
++main ()
++{
++static struct tm ac_aggr;
++if (sizeof ac_aggr.tm_zone)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_tm_tm_zone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_member_struct_tm_tm_zone=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
++echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
++if test $ac_cv_member_struct_tm_tm_zone = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_TM_TM_ZONE 1
++_ACEOF
++
++
++fi
++
++if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_TM_ZONE 1
++_ACEOF
++
++else
++  echo "$as_me:$LINENO: checking for tzname" >&5
++echo $ECHO_N "checking for tzname... $ECHO_C" >&6
++if test "${ac_cv_var_tzname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++#ifndef tzname /* For SGI.  */
++extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
++#endif
++
++int
++main ()
++{
++atoi(*tzname);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_tzname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_tzname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
++echo "${ECHO_T}$ac_cv_var_tzname" >&6
++  if test $ac_cv_var_tzname = yes; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_TZNAME 1
++_ACEOF
++
++  fi
++fi
++
++
++
++
++
++
++
++
++for ac_func in vprintf
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++echo "$as_me:$LINENO: checking for _doprnt" >&5
++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
++if test "${ac_cv_func__doprnt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define _doprnt innocuous__doprnt
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char _doprnt (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef _doprnt
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char _doprnt ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub__doprnt) || defined (__stub____doprnt)
++choke me
++#else
++char (*f) () = _doprnt;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != _doprnt;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func__doprnt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func__doprnt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
++echo "${ECHO_T}$ac_cv_func__doprnt" >&6
++if test $ac_cv_func__doprnt = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DOPRNT 1
++_ACEOF
++
++fi
++
++fi
++done
++
++
++
++
++CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++
++
++
++# Check whether --with-bdb or --without-bdb was given.
++if test "${with_bdb+set}" = set; then
++  withval="$with_bdb"
++  with_bdb=$withval
++else
++  with_bdb="yes"
++fi; 
++
++
++# Check whether --with-dbdir or --without-dbdir was given.
++if test "${with_dbdir+set}" = set; then
++  withval="$with_dbdir"
++  with_bdb=$withval
++fi; 
++
++case "$with_bdb" in
++  no)
++	use_berkeley="no"
++	;;
++  yes)
++	use_berkeley="yes"
++	with_bdb_lib=none
++	with_bdb_inc=none
++	;;
++  
++  *)
++	use_berkeley="yes"
++	with_bdb_lib="$with_bdb/lib"
++	with_bdb_inc="$with_bdb/include"
++	;;
++esac
++
++if test "$use_berkeley" != "no"; then
++  
++
++# Check whether --with-bdb-libdir or --without-bdb-libdir was given.
++if test "${with_bdb_libdir+set}" = set; then
++  withval="$with_bdb_libdir"
++  with_bdb_lib=$withval
++else
++   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
++fi; 
++
++# Check whether --with-bdb-incdir or --without-bdb-incdir was given.
++if test "${with_bdb_incdir+set}" = set; then
++  withval="$with_bdb_incdir"
++  with_bdb_inc=$withval
++else
++   test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
++fi; 
++
++
++	
++
++	cmu_save_CPPFLAGS=$CPPFLAGS
++
++	if test -d $with_bdb_inc; then
++	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
++	    BDB_INCADD="-I$with_bdb_inc"
++	else
++	    BDB_INCADD=""
++	fi
++
++	                if test "${ac_cv_header_db_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for db.h" >&5
++echo $ECHO_N "checking for db.h... $ECHO_C" >&6
++if test "${ac_cv_header_db_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
++echo "${ECHO_T}$ac_cv_header_db_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking db.h usability" >&5
++echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <db.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking db.h presence" >&5
++echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <db.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: db.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for db.h" >&5
++echo $ECHO_N "checking for db.h... $ECHO_C" >&6
++if test "${ac_cv_header_db_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_db_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
++echo "${ECHO_T}$ac_cv_header_db_h" >&6
++
++fi
++if test $ac_cv_header_db_h = yes; then
++  
++	BDB_SAVE_LDFLAGS=$LDFLAGS
++
++	if test -d $with_bdb_lib; then
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
++  else
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++	else
++	    BDB_LIBADD=""
++	fi
++
++	saved_LIBS=$LIBS
++        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <db.h>
++int
++main ()
++{
++db_create(NULL, NULL, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	    if test "$dblib" = "berkeley"; then break; fi
++          done
++        if test "$dblib" = "no"; then
++	    LIBS="$saved_LIBS -ldb"
++	    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <db.h>
++int
++main ()
++{
++db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        fi
++	LIBS=$saved_LIBS
++
++	LDFLAGS=$BDB_SAVE_LDFLAGS
++
++else
++  dblib="no"
++fi
++
++
++
++	CPPFLAGS=$cmu_save_CPPFLAGS
++
++
++  if test "$dblib" = "no"; then
++    { { echo "$as_me:$LINENO: error: Berkeley DB 3.x or later was not found.  You may need to 
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&5
++echo "$as_me: error: Berkeley DB 3.x or later was not found.  You may need to 
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++
++  if test "$with_bdb_lib" != "none"; then
++    
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
++  fi
++
++  fi
++
++  BDB_INC=${BDB_INCADD}
++  BDB_LIB=${BDB_LIBADD}
++  
++  
++
++  LIBS="${LIBS} ${BDB_LIBADD}"
++  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
++
++  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_BDB 
++_ACEOF
++
++fi
++
++
++
++
++SIEVE_SUBDIRS=""
++sievedir="sieve"
++# Check whether --enable-sieve or --disable-sieve was given.
++if test "${enable_sieve+set}" = set; then
++  enableval="$enable_sieve"
++  if test "$enableval" = no; then
++ 		sievedir="no"
++	fi
++fi; 
++
++if test "$sievedir" != "no"; then
++	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
++	
++	SIEVE_LIBS="../${sievedir}/libsieve.a"
++	
++	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define USE_SIEVE 
++_ACEOF
++
++
++		for ac_prog in 'bison -y' byacc
++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_YACC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  echo "$as_me:$LINENO: result: $YACC" >&5
++echo "${ECHO_T}$YACC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$YACC" && break
++done
++test -n "$YACC" || YACC="yacc"
++
++	for ac_prog in flex lex
++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_LEX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  echo "$as_me:$LINENO: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
++if test -z "$LEXLIB"
++then
++  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_fl_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_fl_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
++if test $ac_cv_lib_l_yywrap = yes; then
++  LEXLIB="-ll"
++fi
++
++fi
++
++fi
++
++if test "x$LEX" != "x:"; then
++  echo "$as_me:$LINENO: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_root+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # The minimal lex program is just a single line: %%.  But some broken lexes
++# (Solaris, I think it was) want two %% lines, so accommodate them.
++cat >conftest.l <<_ACEOF
++%%
++%%
++_ACEOF
++{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
++  (eval $LEX conftest.l) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
++rm -f conftest.l
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent. Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
++ac_save_LIBS=$LIBS
++LIBS="$LIBS $LEXLIB"
++cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_lex_yytext_pointer=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
++rm -f "${LEX_OUTPUT_ROOT}.c"
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define YYTEXT_POINTER 1
++_ACEOF
++
++fi
++
++fi
++	
++echo "$as_me:$LINENO: checking for main in -lfl" >&5
++echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_main+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++
++int
++main ()
++{
++main ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_fl_main=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_fl_main=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_main" >&6
++if test $ac_cv_lib_fl_main = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBFL 1
++_ACEOF
++
++  LIBS="-lfl $LIBS"
++
++fi
++
++
++ 	echo "$as_me:$LINENO: checking for library containing regcomp" >&5
++echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6
++if test "${ac_cv_search_regcomp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_regcomp=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char regcomp ();
++int
++main ()
++{
++regcomp ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_regcomp="none required"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_regcomp" = no; then
++  for ac_lib in rx regex; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char regcomp ();
++int
++main ()
++{
++regcomp ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_regcomp="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
++echo "${ECHO_T}$ac_cv_search_regcomp" >&6
++if test "$ac_cv_search_regcomp" != no; then
++  test "$ac_cv_search_regcomp" = "none required" || LIBS="$ac_cv_search_regcomp $LIBS"
++  
++ 			
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_REGEX 
++_ACEOF
++
++		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for rxposix.h" >&5
++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
++if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking rxposix.h usability" >&5
++echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <rxposix.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking rxposix.h presence" >&5
++echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <rxposix.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: rxposix.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for rxposix.h" >&5
++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
++if test "${ac_cv_header_rxposix_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_rxposix_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
++
++fi
++if test $ac_cv_header_rxposix_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_RX 
++_ACEOF
++
++fi
++
++
++fi
++
++  		
++
++	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
++fi
++
++
++
++echo "$as_me:$LINENO: checking for strerror" >&5
++echo $ECHO_N "checking for strerror... $ECHO_C" >&6
++if test "${ac_cv_func_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strerror to an innocuous variant, in case <limits.h> declares strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strerror innocuous_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strerror) || defined (__stub___strerror)
++choke me
++#else
++char (*f) () = strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
++echo "${ECHO_T}$ac_cv_func_strerror" >&6
++if test $ac_cv_func_strerror = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAS_STRERROR 
++_ACEOF
++
++else
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_SYS_ERRLIST 
++_ACEOF
++
++fi
++
++
++
++for ac_header in sys/resource.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++for ac_func in setrlimit
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++for ac_func in getrlimit
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++for ac_func in daemon setsid
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++for ac_func in shutdown
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/socket.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "socklen_t" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SOCKLEN_T 
++_ACEOF
++
++fi
++rm -f conftest*
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/socket.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "sockaddr_storage" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/resource.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "rlim_t" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_RLIM_T 
++_ACEOF
++
++fi
++rm -f conftest*
++
++
++spt_type=""
++echo "$as_me:$LINENO: checking for setproctitle" >&5
++echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6
++if test "${ac_cv_func_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define setproctitle to an innocuous variant, in case <limits.h> declares setproctitle.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define setproctitle innocuous_setproctitle
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char setproctitle (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef setproctitle
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setproctitle ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_setproctitle) || defined (__stub___setproctitle)
++choke me
++#else
++char (*f) () = setproctitle;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != setproctitle;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
++echo "${ECHO_T}$ac_cv_func_setproctitle" >&6
++if test $ac_cv_func_setproctitle = yes; then
++  spt_type=SPT_BUILTIN
++fi
++
++if test "$spt_type" = ""; then
++		echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
++echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
++if test "${ac_cv_lib_util_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setproctitle ();
++int
++main ()
++{
++setproctitle ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_util_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_util_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
++echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
++if test $ac_cv_lib_util_setproctitle = yes; then
++  spt_type=SPT_BUILTIN
++			LIBS="${LIBS} -lutil"
++fi
++
++fi
++if test "$spt_type" = ""; then
++	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
++echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sys/pstat.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
++echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/pstat.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_pstat_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sys_pstat_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
++
++fi
++if test $ac_cv_header_sys_pstat_h = yes; then
++  spt_type=SPT_PSTAT
++fi
++
++
++fi
++if test "$spt_type" = ""; then
++	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
++echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sys/sysnews.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
++echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/sysnews.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sys_sysnews_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
++
++fi
++if test $ac_cv_header_sys_sysnews_h = yes; then
++  spt_type=SPT_SYSMIPS
++fi
++
++
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
++echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_psstrings+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <machine/vmparam.h>
++#include <sys/exec.h>
++#ifndef PS_STRINGS
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_psstrings=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_psstrings=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_psstrings = yes; then
++		spt_type=SPT_PSSTRINGS
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
++echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for SCO" >&5
++echo $ECHO_N "checking for SCO... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_sco+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifndef _SCO_unix_
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_sco=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_sco=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_sco = yes; then
++		spt_type=SPT_SCO
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
++echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
++fi
++if test "$spt_type" = ""; then
++	echo "$as_me:$LINENO: checking for setproctitle usability" >&5
++echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
++	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_sys_setproctitle=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_sys_setproctitle=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++	if test $cyrus_cv_sys_setproctitle = no; then
++		spt_type=SPT_NONE
++	fi
++	echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
++echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6
++fi
++if test "$spt_type" != ""; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SPT_TYPE $spt_type
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking nonblocking method" >&5
++echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6
++if test "${cyrus_cv_sys_nonblock+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/file.h>
++#include <fcntl.h>
++#ifndef	FNDELAY
++#define FNDELAY		O_NDELAY
++#endif
++int
++main ()
++{
++fcntl(0, F_GETFL, 0)&FNDELAY
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_sys_nonblock=fcntl
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cyrus_cv_sys_nonblock=ioctl
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++WITH_NONBLOCK=$cyrus_cv_sys_nonblock
++
++echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
++echo "${ECHO_T}$WITH_NONBLOCK" >&6
++
++echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
++echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6
++if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <time.h>
++int
++main ()
++{
++struct tm tm;
++tm.tm_gmtoff = 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_struct_sys_gmtoff=tm
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cyrus_cv_struct_sys_gmtoff=gmtime
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
++
++echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
++echo "${ECHO_T}$WITH_GMTOFF" >&6
++echo "$as_me:$LINENO: checking for shared mmap" >&5
++echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6
++if test "${cyrus_cv_func_mmap_shared+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  cyrus_cv_func_mmap_shared=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base+4, "test", 4) != 0) exit(1);
++exit(0);}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_func_mmap_shared=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++cyrus_cv_func_mmap_shared=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++
++echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
++echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6
++if test $cyrus_cv_func_mmap_shared = yes; then
++	WITH_MAP="shared"
++else
++echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
++echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6
++if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  cyrus_cv_func_mmap_stupidshared=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++main() {
++char *base;
++int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
++if (fd == -1) exit(1);
++if (write(fd, "test", 4) != 4) exit(1);
++fsync(fd);
++base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
++#ifdef MAP_FILE
++| MAP_FILE
++#endif
++#ifdef MAP_VARIABLE
++| MAP_VARIABLE
++#endif
++, fd, 0L);
++if (base == (caddr_t)-1) exit(1);
++if (strncmp(base, "test", 4) != 0) exit(1);
++lseek(fd, 0L, 0);	
++if (write(fd, "xyzz", 4) != 4) exit(1);
++fsync(fd);
++if (strncmp(base, "xyzz", 4) != 0) exit(1);
++exit(0);}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cyrus_cv_func_mmap_stupidshared=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++cyrus_cv_func_mmap_stupidshared=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++
++echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
++echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6
++if test $cyrus_cv_func_mmap_stupidshared = yes; then
++	WITH_MAP="stupidshared"
++else
++	{ echo "$as_me:$LINENO: WARNING: *** This system does not have a working mmap()" >&5
++echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: *** Expect a considerable performance penalty" >&5
++echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
++	WITH_MAP=nommap
++fi
++fi
++
++
++
++# Check whether --with-lock or --without-lock was given.
++if test "${with_lock+set}" = set; then
++  withval="$with_lock"
++  WITH_LOCK="$withval"
++else
++  
++  echo "$as_me:$LINENO: checking for fcntl" >&5
++echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
++if test "${ac_cv_func_fcntl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fcntl to an innocuous variant, in case <limits.h> declares fcntl.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fcntl innocuous_fcntl
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fcntl (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fcntl
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fcntl ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fcntl) || defined (__stub___fcntl)
++choke me
++#else
++char (*f) () = fcntl;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fcntl;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fcntl=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fcntl=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
++echo "${ECHO_T}$ac_cv_func_fcntl" >&6
++if test $ac_cv_func_fcntl = yes; then
++  WITH_LOCK="fcntl"
++else
++  
++		echo "$as_me:$LINENO: checking for flock" >&5
++echo $ECHO_N "checking for flock... $ECHO_C" >&6
++if test "${ac_cv_func_flock+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define flock to an innocuous variant, in case <limits.h> declares flock.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define flock innocuous_flock
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char flock (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef flock
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char flock ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_flock) || defined (__stub___flock)
++choke me
++#else
++char (*f) () = flock;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != flock;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_flock=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_flock=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
++echo "${ECHO_T}$ac_cv_func_flock" >&6
++if test $ac_cv_func_flock = yes; then
++  WITH_LOCK="flock"
++else
++  
++				{ { echo "$as_me:$LINENO: error: unable to detect locking method" >&5
++echo "$as_me: error: unable to detect locking method" >&2;}
++   { (exit 1); exit 1; }; }
++			      
++fi
++
++		
++fi
++
++  
++fi; 
++
++
++
++LIB_RT=""
++echo "$as_me:$LINENO: checking for fdatasync" >&5
++echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
++if test "${ac_cv_func_fdatasync+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fdatasync innocuous_fdatasync
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fdatasync (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fdatasync
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fdatasync ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fdatasync) || defined (__stub___fdatasync)
++choke me
++#else
++char (*f) () = fdatasync;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fdatasync;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fdatasync=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fdatasync=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
++echo "${ECHO_T}$ac_cv_func_fdatasync" >&6
++if test $ac_cv_func_fdatasync = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FDATASYNC 
++_ACEOF
++
++else
++  
++  echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
++echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
++if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fdatasync ();
++int
++main ()
++{
++fdatasync ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rt_fdatasync=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rt_fdatasync=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6
++if test $ac_cv_lib_rt_fdatasync = yes; then
++  
++	LIB_RT="-lrt"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FDATASYNC 
++_ACEOF
++
++  
++fi
++
++
++fi
++
++
++cant_find_sigvec=no
++if test "${cyrus_sigveclib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++  echo "$as_me:$LINENO: checking for sigvec" >&5
++echo $ECHO_N "checking for sigvec... $ECHO_C" >&6
++if test "${ac_cv_func_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define sigvec to an innocuous variant, in case <limits.h> declares sigvec.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define sigvec innocuous_sigvec
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char sigvec (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef sigvec
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_sigvec) || defined (__stub___sigvec)
++choke me
++#else
++char (*f) () = sigvec;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != sigvec;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
++echo "${ECHO_T}$ac_cv_func_sigvec" >&6
++if test $ac_cv_func_sigvec = yes; then
++  
++	cyrus_sigveclib=""
++  
++else
++  
++    echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
++echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6
++if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lBSD  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++int
++main ()
++{
++sigvec ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_BSD_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_BSD_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
++echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6
++if test $ac_cv_lib_BSD_sigvec = yes; then
++  cyrus_sigveclib="-lBSD"
++else
++  
++        SAVE_LDFLAGS="$LDFLAGS"
++        LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
++    echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
++echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6
++if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lucb  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sigvec ();
++int
++main ()
++{
++sigvec ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ucb_sigvec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ucb_sigvec=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6
++if test $ac_cv_lib_ucb_sigvec = yes; then
++  
++            cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
++else
++   cant_find_sigvec=yes 
++fi
++
++    LDFLAGS="$SAVE_LDFLAGS"
++fi
++
++  
++fi
++
++
++fi
++
++
++
++# ok, we still look for this stuff because of checking groups, but
++# all authentication goes through SASL
++
++
++# Check whether --with-afs or --without-afs was given.
++if test "${with_afs+set}" = set; then
++  withval="$with_afs"
++  with_afs="${withval}"
++else
++  with_afs="no"
++fi; 
++
++
++# Check whether --with-ldap or --without-ldap was given.
++if test "${with_ldap+set}" = set; then
++  withval="$with_ldap"
++  with_ldap="${withval}"
++else
++  with_ldap="no"
++fi; 
++
++# Check whether --enable-krb5afspts or --disable-krb5afspts was given.
++if test "${enable_krb5afspts+set}" = set; then
++  enableval="$enable_krb5afspts"
++  SASL_GSSAPI_LIBS_SET="yes"
++
++         
++cat >>confdefs.h <<\_ACEOF
++@%:@define AFSPTS_USE_KRB5 
++_ACEOF
++
++fi; 
++
++if test "x$with_afs" != "xno"; then
++    if test ! -d $with_afs; then
++        $with_afs=/usr/local
++    fi
++    CFLAGS="${CFLAGS} -I${with_afs}/include"
++    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
++    if test -f ${with_afs}/lib/afs/libaudit.a; then
++    AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
++    fi
++    if test -f /usr/ucblib/libucb.a; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
++  else
++	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_runpath_switch/usr/ucblib"
++  fi
++
++    AFS_LIBS="$AFS_LIBS -lc -lucb"
++    fi
++
++    if test "${cyrus_afs_sigvec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++        SAVE_LIBS="$LIBS"
++        LIBS="${with_afs}/lib/liblwp.a"
++        echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
++echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6
++                        cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++IOMGR_Initialize();
++int
++main ()
++{
++IOMGR_Initialize()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++                                                echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++                        cyrus_afs_sigvec="no"
++                
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++                                                echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++                        cyrus_afs_sigvec="yes"
++                
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++        
++fi
++
++    if test "$cyrus_afs_sigvec" = yes; then
++      if test "$cant_find_sigvec" = yes; then
++        { echo "$as_me:$LINENO: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
++echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
++      else
++        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
++        
++        
++        
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_AFSKRB 
++_ACEOF
++
++      fi
++    else
++      AFS_LIBS="${AFS_LIBS}"
++      
++      
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_AFSKRB 
++_ACEOF
++
++    fi
++    LIBS="$SAVE_LIBS"
++fi
++
++LDAP_CPPFLAGS=""
++LDAP_LDFLAGS=""
++LDAP_LIBS=""
++
++if test "x$with_ldap" != "xno"; then
++    if test ! -d $with_ldap; then
++        $with_ldap=/usr/local
++    fi
++
++    LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
++    LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
++    LDAP_LIBS=""
++
++    save_CPPFLAGS=$CPPFLAGS
++    save_LDFLAGS=$LDFLAGS
++    CPPFLAGS=$LDAP_CPPFLAGS
++    LDFLAGS=$LDAP_LDFLAGS
++
++    echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
++echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
++if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lldap -llber $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ldap_initialize ();
++int
++main ()
++{
++ldap_initialize ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ldap_ldap_initialize=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ldap_ldap_initialize=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
++echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
++if test $ac_cv_lib_ldap_ldap_initialize = yes; then
++   
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LDAP 
++_ACEOF
++
++          
++          
++          	
++          LDAP_LIBS="-lldap -llber" 
++fi
++
++
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++fi
++
++if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define WITH_PTS 
++_ACEOF
++
++fi
++
++SERVER_SUBDIRS="master imap"
++# Check whether --enable-server or --disable-server was given.
++if test "${enable_server+set}" = set; then
++  enableval="$enable_server"
++  if test "$enableval" = no; then
++        	SERVER_SUBDIRS=""
++	fi
++fi; 
++
++# We always output a server makefile (just because we can)
++
++
++# Check whether --with-krb or --without-krb was given.
++if test "${with_krb+set}" = set; then
++  withval="$with_krb"
++  with_krb="$withval"
++else
++  with_krb="no"
++fi; 
++
++
++# Check whether --with-krbimpl or --without-krbimpl was given.
++if test "${with_krbimpl+set}" = set; then
++  withval="$with_krbimpl"
++  with_krbimpl="$withval"
++else
++  with_krbimpl="kth"
++fi; 
++
++# Check whether --enable-statickrb or --disable-statickrb was given.
++if test "${enable_statickrb+set}" = set; then
++  enableval="$enable_statickrb"
++  with_statickrb="yes"
++else
++  with_statickrb="no"
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBRESOLV 1
++_ACEOF
++
++  LIBS="-lresolv $LIBS"
++
++fi
++
++
++if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
++      { { echo "$as_me:$LINENO: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&5
++echo "$as_me: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&2;}
++   { (exit 1); exit 1; }; }
++fi 
++
++if test "$with_krb" != "no"; then
++
++# Check whether --with-krbdes or --without-krbdes was given.
++if test "${with_krbdes+set}" = set; then
++  withval="$with_krbdes"
++  with_krbdes="$withval"
++else
++  with_krbdes="yes"
++fi; 
++if test "$with_krbdes" = "yes"; then
++  echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
++echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6
++if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldes  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char des_ecb_encrypt ();
++int
++main ()
++{
++des_ecb_encrypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_des_des_ecb_encrypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_des_des_ecb_encrypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6
++if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
++  if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$with_krb/lib/libdes.a"
++      else
++          KRB_LIBS="-ldes"
++      fi
++else
++  { { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
++echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++fi
++fi
++
++if test -d ${with_krb}; then
++   echo "$as_me:$LINENO: checking for Kerberos includes" >&5
++echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6
++if test "${cyrus_krbinclude+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++     for krbhloc in include/kerberosIV include
++     do
++       if test -f ${with_krb}/${krbhloc}/krb.h ; then
++         cyrus_krbinclude=${with_krb}/${krbhloc}
++         break
++       fi
++     done
++     
++fi
++echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
++echo "${ECHO_T}$cyrus_krbinclude" >&6
++
++   if test -n "${cyrus_krbinclude}"; then
++     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
++   fi
++   
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L${with_krb}/lib $andrew_runpath_switch${with_krb}/lib ${LDFLAGS}"
++  fi
++
++fi
++
++if test "$with_krbimpl" != "kth"; then
++  KRBLIB="krb4"
++else
++  KRBLIB="krb"
++fi
++
++if test "$with_des" != no; then
++  if test "${ac_cv_header_krb_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for krb.h" >&5
++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
++if test "${ac_cv_header_krb_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking krb.h usability" >&5
++echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <krb.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking krb.h presence" >&5
++echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <krb.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for krb.h" >&5
++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
++if test "${ac_cv_header_krb_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_krb_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb_h" >&6
++
++fi
++if test $ac_cv_header_krb_h = yes; then
++  as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
++echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char krb_mk_priv ();
++int
++main ()
++{
++krb_mk_priv ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Lib=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Lib=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++  if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
++      else
++          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
++      fi
++else
++  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++fi
++
++else
++  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++fi
++
++
++else
++  { echo "$as_me:$LINENO: WARNING: No DES library found for Kerberos V4 support" >&5
++echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
++  krb4=no
++fi
++
++if test "${krb4}" != no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_KRB 
++_ACEOF
++
++fi
++
++LIBS="$KRB_LIBS $LIBS"
++
++SASL_GSSAPI_LIBS_SET="yes"
++
++
++IMAP_PROGS=""
++
++# Check whether --with-openssl or --without-openssl was given.
++if test "${with_openssl+set}" = set; then
++  withval="$with_openssl"
++  with_openssl="${withval}"
++fi; 
++
++OPENSSL_INC=
++OPENSSL_LIB=
++case "$with_openssl" in
++	no) with_openssl="no";;
++	""|yes) 
++	  	                  LIB_RSAREF=""
++	        echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
++echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6
++if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrsaref  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char RSAPublicEncrypt ();
++int
++main ()
++{
++RSAPublicEncrypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rsaref_RSAPublicEncrypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rsaref_RSAPublicEncrypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6
++if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
++  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
++else
++  cmu_have_rsaref=no
++fi
++
++
++		with_openssl="yes"
++		echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
++echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypto $LIB_RSAREF $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char BIO_accept ();
++int
++main ()
++{
++BIO_accept ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypto_BIO_accept=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypto_BIO_accept=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6
++if test $ac_cv_lib_crypto_BIO_accept = yes; then
++  LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
++else
++  with_openssl="no"
++fi
++
++		echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
++echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char SSL_CTX_new ();
++int
++main ()
++{
++SSL_CTX_new ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ssl_SSL_CTX_new=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ssl_SSL_CTX_new=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6
++if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
++  LIBS="-lssl ${LIBS}"
++else
++  with_openssl="no"
++fi
++
++		
++		;;
++	*)  OPENSSL_INC="-I${with_openssl}/include"
++	    OPENSSL_LIBPATH="${with_openssl}/lib"
++	    OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
++	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
++	    
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
++  else
++	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
++  fi
++
++	    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
++  else
++	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_runpath_switch${OPENSSL_LIBPATH}"
++  fi
++
++	    LIBS="${LIBS} -lssl -lcrypto";;
++esac
++
++echo "$as_me:$LINENO: checking for openssl" >&5
++echo $ECHO_N "checking for openssl... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $with_openssl" >&5
++echo "${ECHO_T}$with_openssl" >&6
++
++if test "$with_openssl" != "no"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_SSL 
++_ACEOF
++
++	IMAP_PROGS="$IMAP_PROGS tls_prune"
++        if test "${krb4}" != no; then
++           
++cat >>confdefs.h <<\_ACEOF
++@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT 
++_ACEOF
++
++           
++cat >>confdefs.h <<\_ACEOF
++@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY 
++_ACEOF
++
++        fi
++fi
++
++
++
++
++# Check whether --with-egd-socket or --without-egd-socket was given.
++if test "${with_egd_socket+set}" = set; then
++  withval="$with_egd_socket"
++   EGD_SOCKET="$withval" 
++      
++fi; 
++if test -n "$EGD_SOCKET" ; then
++      
++cat >>confdefs.h <<_ACEOF
++@%:@define EGD_SOCKET "$EGD_SOCKET"
++_ACEOF
++
++fi
++
++
++# Check whether --with-zephyr or --without-zephyr was given.
++if test "${with_zephyr+set}" = set; then
++  withval="$with_zephyr"
++  with_zephyr="${withval}"
++fi; 
++if test -z "$with_zephyr"; then
++     if test -f /usr/local/lib/libzephyr.a; then
++	with_zephyr="/usr/local"
++     elif test -f /usr/lib/libzephyr.a; then
++        with_zephyr="/usr"
++     fi
++fi
++ZEPHYR_LIBS=""
++ZEPHYR_CPPFLAGS=""
++case "$with_zephyr" in
++	no) true;;
++	""|yes) echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
++echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6
++if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lzephyr  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ZInitialize ();
++int
++main ()
++{
++ZInitialize ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_zephyr_ZInitialize=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_zephyr_ZInitialize=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
++echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6
++if test $ac_cv_lib_zephyr_ZInitialize = yes; then
++  ZEPHYR_LIBS="-lzephyr"
++else
++  with_zephyr="no"
++fi
++;;
++       *)  if test -d ${with_zephyr}/include/zephyr; then
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
++           else
++               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
++           fi
++           ZEPHYR_LIBS="-lzephyr";;
++esac
++
++
++if test "$with_zephyr" != "no"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ZEPHYR 
++_ACEOF
++
++fi
++
++
++# Check whether --with-pidfile or --without-pidfile was given.
++if test "${with_pidfile+set}" = set; then
++  withval="$with_pidfile"
++  MASTERPIDFILE="$withval"
++else
++  MASTERPIDFILE="/var/run/cyrus-master.pid"
++fi; 
++MASTERPIDFILE="\"$MASTERPIDFILE\""
++
++cat >>confdefs.h <<_ACEOF
++@%:@define MASTER_PIDFILE $MASTERPIDFILE
++_ACEOF
++
++
++
++# Check whether --with-idle or --without-idle was given.
++if test "${with_idle+set}" = set; then
++  withval="$with_idle"
++  WITH_IDLE="${withval}"
++else
++  WITH_IDLE="poll"
++fi; 
++
++if test "$WITH_IDLE" = "idled"; then
++  IMAP_PROGS="$IMAP_PROGS idled"
++fi
++
++ENABLE_NNTP=no
++# Check whether --enable-nntp or --disable-nntp was given.
++if test "${enable_nntp+set}" = set; then
++  enableval="$enable_nntp"
++  ENABLE_NNTP=$enableval
++        if test "$ENABLE_NNTP" != no; then
++	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
++        fi
++fi;  
++
++# Check whether --enable-murder or --disable-murder was given.
++if test "${enable_murder+set}" = set; then
++  enableval="$enable_murder"
++  if test "$enableval" != no; then
++	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
++        fi
++fi;  
++
++
++
++
++# Check whether --with-com_err or --without-com_err was given.
++if test "${with_com_err+set}" = set; then
++  withval="$with_com_err"
++  
++fi; 
++if test -z "$with_com_err"; then
++	# no value supplied
++	echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
++echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
++if test "${ac_cv_lib_com_err_com_err+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcom_err  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char com_err ();
++int
++main ()
++{
++com_err ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_com_err_com_err=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_com_err_com_err=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
++echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
++if test $ac_cv_lib_com_err_com_err = yes; then
++  
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for et/com_err.h" >&5
++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
++echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <et/com_err.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
++echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <et/com_err.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for et/com_err.h" >&5
++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_et_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_et_com_err_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
++
++fi
++if test $ac_cv_header_et_com_err_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ET_COM_ERR_H 
++_ACEOF
++
++else
++  if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for com_err.h" >&5
++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking com_err.h usability" >&5
++echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <com_err.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking com_err.h presence" >&5
++echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <com_err.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: com_err.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for com_err.h" >&5
++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
++if test "${ac_cv_header_com_err_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_com_err_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
++
++fi
++if test $ac_cv_header_com_err_h = yes; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: cannot locate com_err.h" >&5
++echo "$as_me: error: cannot locate com_err.h" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++fi
++
++
++		# Extract the first word of "compile_et", so it can be a program name with args.
++set dummy compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	
++else
++  
++	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
++		with_com_err="/usr/local"
++		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
++set dummy /usr/local/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
++		with_com_err="/usr"
++		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
++set dummy /usr/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $COMPILE_ET in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
++  ;;
++  *)
++  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_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
++  ;;
++esac
++fi
++COMPILE_ET=$ac_cv_path_COMPILE_ET
++
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	else
++		# use ours
++		with_com_err=yes
++	fi
++	
++fi
++
++
++	if test "${with_com_err}" = "no"; then
++	  { echo "$as_me:$LINENO: WARNING: com_err is required; included version will be used." >&5
++echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
++	  with_com_err="yes"
++	fi
++	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
++	  { echo "$as_me:$LINENO: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
++echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
++	  { echo "$as_me:$LINENO: WARNING: Will build com_err from included sources." >&5
++echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
++	  with_com_err="yes" # build it ourselves
++	fi
++fi
++
++case "$with_com_err" in
++  # built-in et
++  yes) # use the com_err we're gonna build
++	  COM_ERR_LIBS="../et/libcom_err.a"
++	  COMPILE_ET="../et/compile_et"
++	  COM_ERR_LDFLAGS=""
++	  COM_ERR_CPPFLAGS="-I\${top_srcdir}/et"
++	  PRE_SUBDIRS="et ${PRE_SUBDIRS}"
++	  EXTRA_OUTPUT="${EXTRA_OUTPUT} et/Makefile"
++	  ;;
++  "")   # no problem, we already have it in the paths
++	# we do nothing to pick it up
++	COM_ERR_LIBS="-lcom_err" # hope it's not shared
++	# we already set COMPILE_ET, or we didn't get here
++	COM_ERR_LDFLAGS=""
++	COM_ERR_CPPFLAGS=""
++      ;;
++  *) # use whatever they told us, or whatever we found
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
++     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
++     # Ever get the feeling people hide this stuff on purpose?
++     if test -d "${with_com_err}/include/et" ; then
++       COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
++     fi
++     COMPILE_ET="${with_com_err}/bin/compile_et"
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for modern syslog" >&5
++echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6
++if test "${cyrus_cv_lib_syslog+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <syslog.h>
++#ifndef LOG_LOCAL6
++#include </nonexistent>
++#endif
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  cyrus_cv_lib_syslog=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  cyrus_cv_lib_syslog=no
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++
++if test $cyrus_cv_lib_syslog = no; then
++	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
++	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
++	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
++fi
++echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
++echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6
++
++echo "$as_me:$LINENO: checking which syslog facility to use" >&5
++echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6
++SYSLOG_FACILITY=LOG_LOCAL6
++
++# Check whether --with-syslogfacility or --without-syslogfacility was given.
++if test "${with_syslogfacility+set}" = set; then
++  withval="$with_syslogfacility"
++   if test "$withval" != "yes" -a "$withval" != "no" ; then
++                       SYSLOG_FACILITY=LOG_$withval
++               fi; 
++fi; 
++
++cat >>confdefs.h <<_ACEOF
++@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
++_ACEOF
++
++echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
++echo "${ECHO_T}$SYSLOG_FACILITY" >&6
++
++
++for ac_func in getdtablesize
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++else
++  case $LIB@&t@OBJS in
++    "$ac_func.$ac_objext"   | \
++  *" $ac_func.$ac_objext"   | \
++    "$ac_func.$ac_objext "* | \
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS $ac_func.$ac_objext" ;;
++esac
++
++fi
++done
++
++
++# Check whether --enable-cmulocal or --disable-cmulocal was given.
++if test "${enable_cmulocal+set}" = set; then
++  enableval="$enable_cmulocal"
++  if test "$enableval" = yes; then
++		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
++		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
++	fi
++fi; 
++
++echo "$as_me:$LINENO: checking to use old sieve service name" >&5
++echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6
++# Check whether --enable-oldsievename or --disable-oldsievename was given.
++if test "${enable_oldsievename+set}" = set; then
++  enableval="$enable_oldsievename"
++  if test "$enableval" = yes; then
++		echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define OLD_SIEVE_SERVICE_NAME 
++_ACEOF
++
++	else
++		echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	fi
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi; 
++
++# Check whether --enable-listext or --disable-listext was given.
++if test "${enable_listext+set}" = set; then
++  enableval="$enable_listext"
++  if test "$enableval" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_LISTEXT 
++_ACEOF
++
++	fi
++fi; 
++
++# Check whether --enable-netscapehack or --disable-netscapehack was given.
++if test "${enable_netscapehack+set}" = set; then
++  enableval="$enable_netscapehack"
++  if test "$enableval" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENABLE_X_NETSCAPE_HACK 
++_ACEOF
++
++	fi
++fi; 
++
++echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  :
++else
++  
++echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBDL 1
++_ACEOF
++
++  LIBS="-ldl $LIBS"
++
++fi
++
++fi
++
++echo "$as_me:$LINENO: checking for crypt" >&5
++echo $ECHO_N "checking for crypt... $ECHO_C" >&6
++if test "${ac_cv_func_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define crypt to an innocuous variant, in case <limits.h> declares crypt.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define crypt innocuous_crypt
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char crypt (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef crypt
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char crypt ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_crypt) || defined (__stub___crypt)
++choke me
++#else
++char (*f) () = crypt;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != crypt;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_crypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_crypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
++echo "${ECHO_T}$ac_cv_func_crypt" >&6
++if test $ac_cv_func_crypt = yes; then
++  cmu_have_crypt=yes
++else
++  echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++if test "${ac_cv_lib_crypt_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char crypt ();
++int
++main ()
++{
++crypt ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypt_crypt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypt_crypt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++if test $ac_cv_lib_crypt_crypt = yes; then
++  LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
++else
++  cmu_have_crypt=no
++fi
++
++fi
++
++
++
++
++
++# Check whether --enable-gssapi or --disable-gssapi was given.
++if test "${enable_gssapi+set}" = set; then
++  enableval="$enable_gssapi"
++  gssapi=$enableval
++else
++  gssapi=yes
++fi; 
++
++# Check whether --with-gss_impl or --without-gss_impl was given.
++if test "${with_gss_impl+set}" = set; then
++  withval="$with_gss_impl"
++  gss_impl=$withval
++else
++  gss_impl=auto
++fi; 
++
++if test "$gssapi" != no; then
++  platform=
++  case "${host}" in
++    *-*-linux*)
++      platform=__linux
++      ;;
++    *-*-hpux*)
++      platform=__hpux
++      ;;
++    *-*-irix*)
++      platform=__irix
++      ;;
++    *-*-solaris2*)
++# When should we use __sunos?
++      platform=__solaris
++      ;;
++    *-*-aix*)
++###_AIX
++      platform=__aix
++      ;;
++    *)
++      { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
++echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
++      if test "$gss_impl" = "cybersafe"; then
++        { { echo "$as_me:$LINENO: error: CyberSafe was forced, cannot continue as platform is not supported" >&5
++echo "$as_me: error: CyberSafe was forced, cannot continue as platform is not supported" >&2;}
++   { (exit 1); exit 1; }; }
++      fi
++      ;;
++  esac
++
++  cmu_saved_CPPFLAGS=$CPPFLAGS
++
++  if test -d ${gssapi}; then
++    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++# We want to keep -I in our CPPFLAGS, but only if we succeed
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++### I am not sure how useful is this (and whether this is required at all
++### especially when we have to provide two -L flags for new CyberSafe
++    LDFLAGS="$LDFLAGS -L$gssapi/lib"
++
++    if test -n "$platform"; then
++      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++        CPPFLAGS="$CPPFLAGS -D$platform"
++        if test -d "${gssapi}/appsec-sdk/include"; then
++          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++        fi
++      fi
++    fi
++  fi
++  if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for gssapi.h" >&5
++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking gssapi.h usability" >&5
++echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <gssapi.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking gssapi.h presence" >&5
++echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <gssapi.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: gssapi.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for gssapi.h" >&5
++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_gssapi_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
++
++fi
++if test $ac_cv_header_gssapi_h = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSSAPI_H 
++_ACEOF
++
++else
++  if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
++echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <gssapi/gssapi.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
++echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <gssapi/gssapi.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
++if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
++
++fi
++if test $ac_cv_header_gssapi_gssapi_h = yes; then
++  :
++else
++  { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
++fi
++
++
++fi
++
++
++
++  CPPFLAGS=$cmu_saved_CPPFLAGS
++
++fi
++
++if test "$gssapi" != no; then
++  # We need to find out which gssapi implementation we are
++  # using. Supported alternatives are: MIT Kerberos 5,
++  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
++  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
++  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
++  #
++  # The choice is reflected in GSSAPIBASE_LIBS
++
++  
++echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LIBRESOLV 1
++_ACEOF
++
++  LIBS="-lresolv $LIBS"
++
++fi
++
++  if test -d ${gssapi}; then
++     gssapi_dir="${gssapi}/lib"
++     GSSAPIBASE_LIBS="-L$gssapi_dir"
++     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
++  else
++     # FIXME: This is only used for building cyrus, and then only as
++     # a real hack.  it needs to be fixed.
++     gssapi_dir="/usr/local/lib"
++  fi
++
++  # Check a full link against the Heimdal libraries.
++  # If this fails, check a full link against the MIT libraries.
++  # If this fails, check a full link against the CyberSafe libraries.
++  # If this fails, check a full link against the Solaris 8 and up libgss.
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6
++if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gssapi_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gssapi_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6
++if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
++  gss_impl="heimdal"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6
++if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gssapi_krb5_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gssapi_krb5_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6
++if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
++  gss_impl="mit"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  # For Cybersafe one has to set a platform define in order to make compilation work
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
++# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
++    if test -d "${gssapi}/appsec-rt/lib"; then
++      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
++    fi
++    CPPFLAGS="$CPPFLAGS -D$platform"
++    if test -d "${gssapi}/appsec-sdk/include"; then
++      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++    fi
++
++    gss_failed=0
++
++# Check for CyberSafe with two libraries first, than fall back to a single 
++# library (older CyberSafe)
++
++    unset ac_cv_lib_gss_csf_gss_acq_user
++    echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char csf_gss_acq_user ();
++int
++main ()
++{
++csf_gss_acq_user ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_csf_gss_acq_user=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_csf_gss_acq_user=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
++if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++  gss_impl="cybersafe03"
++else
++  unset ac_cv_lib_gss_csf_gss_acq_user;
++                  echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char csf_gss_acq_user ();
++int
++main ()
++{
++csf_gss_acq_user ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_csf_gss_acq_user=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_csf_gss_acq_user=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
++if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++  gss_impl="cybersafe"
++else
++  gss_failed=1
++fi
++
++fi
++
++
++    if test "$gss_failed" = "1"; then
++# Restore variables
++      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
++      CPPFLAGS=$cmu_saved_CPPFLAGS
++
++      if test "$gss_impl" != "auto"; then
++        gss_impl="failed"
++      fi
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
++    gss_failed=0
++    echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
++echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6
++if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgss -lgss $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gss_unwrap ();
++int
++main ()
++{
++gss_unwrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_gss_gss_unwrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gss_gss_unwrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
++echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6
++if test $ac_cv_lib_gss_gss_unwrap = yes; then
++  gss_impl="seam"
++else
++  gss_failed=1
++fi
++
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "mit"; then
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++  elif test "$gss_impl" = "heimdal"; then
++    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++  elif test "$gss_impl" = "cybersafe03"; then
++# Version of CyberSafe with two libraries
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "cybersafe"; then
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "seam"; then
++    GSSAPIBASE_LIBS=-lgss
++    # there is no static libgss on Solaris 8 and up
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "failed"; then
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - specified library not found" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
++  else
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no library" >&5
++echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
++  fi
++fi
++
++#
++# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
++# in gssapi\rfckrb5.h
++#
++if test "$gssapi" != "no"; then
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
++                    hostbased_service_gss_nt_yes
++                  #endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++else
++  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
++echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++fi
++rm -f conftest*
++
++
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  fi
++
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_USER_NAME
++                   user_name_yes_gss_nt
++                  #endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++else
++  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
++echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <gssapi/gssapi.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GSS_C_NT_USER_NAME 
++_ACEOF
++
++fi
++rm -f conftest*
++
++  fi
++fi
++
++GSSAPI_LIBS=""
++echo "$as_me:$LINENO: checking GSSAPI" >&5
++echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6
++if test "$gssapi" != no; then
++  echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
++echo "${ECHO_T}with implementation ${gss_impl}" >&6
++  echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char res_search ();
++int
++main ()
++{
++res_search ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_resolv_res_search=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_res_search=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
++if test $ac_cv_lib_resolv_res_search = yes; then
++  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
++fi
++
++  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
++  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
++
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  
++for ac_func in gsskrb5_register_acceptor_identity
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++  LIBS="$cmu_save_LIBS"
++else
++  echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6
++fi
++
++
++
++
++
++
++# Check whether --with-sasl or --without-sasl was given.
++if test "${with_sasl+set}" = set; then
++  withval="$with_sasl"
++  with_sasl="$withval"
++else
++  with_sasl="yes"
++fi; 
++
++
++# Check whether --with-staticsasl or --without-staticsasl was given.
++if test "${with_staticsasl+set}" = set; then
++  withval="$with_staticsasl"
++  with_staticsasl="$withval";
++             if test $with_staticsasl != "no"; then
++               using_static_sasl="static"
++             fi
++else
++  with_staticsasl="no"; using_static_sasl="no"
++fi; 
++
++SASLFLAGS=""
++LIB_SASL=""
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++cmu_saved_LDFLAGS=$LDFLAGS
++cmu_saved_LIBS=$LIBS
++
++if test ${with_staticsasl} != "no"; then
++  if test -d ${with_staticsasl}; then
++    if test -d ${with_staticsasl}/lib64 ; then
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
++    else
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    fi
++    ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    ac_cv_sasl_where_inc=${with_staticsasl}/include
++
++    SASLFLAGS="-I$ac_cv_sasl_where_inc"
++    LIB_SASL="-L$ac_cv_sasl_where_lib"
++    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++  else
++    with_staticsasl="/usr"
++  fi
++
++  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/sasl.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/sasl.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_sasl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++
++fi
++if test $ac_cv_header_sasl_sasl_h = yes; then
++  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/saslutil.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/saslutil.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++
++fi
++if test $ac_cv_header_sasl_saslutil_h = yes; then
++  for i42 in lib64 lib; do
++                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
++                                        ac_cv_found_sasl=yes
++                                        echo "$as_me:$LINENO: checking for static libsasl" >&5
++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
++                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
++                                      fi
++                                    done
++                                    if test ! "$ac_cv_found_sasl" = "yes"; then
++                                      echo "$as_me:$LINENO: checking for static libsasl" >&5
++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
++                                      { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
++echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
++   { (exit 1); exit 1; }; }
++                                    fi
++fi
++
++
++fi
++
++
++
++  echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6
++
++  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
++    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
++  else
++    SASL_GSSAPI_LIBS_SET=""
++    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
++  fi
++fi
++
++if test -d ${with_sasl}; then
++  ac_cv_sasl_where_lib=${with_sasl}/lib
++  ac_cv_sasl_where_inc=${with_sasl}/include
++
++  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
++  else
++	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
++  fi
++
++  fi
++  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
++  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++fi
++
++# be sure to check for a SASLv2 specific function
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/sasl.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/sasl.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_sasl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
++
++fi
++if test $ac_cv_header_sasl_sasl_h = yes; then
++  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <sasl/saslutil.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sasl/saslutil.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
++if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
++
++fi
++if test $ac_cv_header_sasl_saslutil_h = yes; then
++  echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
++echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6
++if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsasl2  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char prop_get ();
++int
++main ()
++{
++prop_get ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_sasl2_prop_get=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_sasl2_prop_get=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
++echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6
++if test $ac_cv_lib_sasl2_prop_get = yes; then
++  ac_cv_found_sasl=yes
++else
++  ac_cv_found_sasl=no
++fi
++
++else
++  ac_cv_found_sasl=no
++fi
++
++
++else
++  ac_cv_found_sasl=no
++fi
++
++
++
++if test "$ac_cv_found_sasl" = "yes"; then
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
++  else
++	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
++  fi
++
++  fi
++  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
++  if test "$using_static_sasl" != "static"; then
++    LIB_SASL=$DYNLIB_SASL
++    SASLFLAGS=$DYNSASLFLAGS
++  fi
++else
++  DYNLIB_SASL=""
++  DYNSASLFLAGS=""
++  using_static_sasl="staticonly"
++fi
++
++if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
++  SASL_GSSAPI_LIBS_SET=""
++  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
++fi
++
++LIBS="$cmu_saved_LIBS"
++LDFLAGS="$cmu_saved_LDFLAGS"
++CPPFLAGS="$cmu_saved_CPPFLAGS"
++
++
++
++
++
++
++
++if test "$ac_cv_found_sasl" != "yes"; then
++  { { echo "$as_me:$LINENO: error: Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&5
++echo "$as_me: error: Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS $SASLFLAGS"
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sasl/sasl.h>
++
++#ifndef SASL_VERSION_MAJOR
++#error SASL_VERSION_MAJOR not defined
++#endif
++#ifndef SASL_VERSION_MINOR
++#error SASL_VERSION_MINOR not defined
++#endif
++#ifndef SASL_VERSION_STEP
++#error SASL_VERSION_STEP not defined
++#endif
++
++#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
++#error SASL version is less than 2.1.7
++#endif
++
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  { { echo "$as_me:$LINENO: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&5
++echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f conftest.err conftest.$ac_ext
++
++CPPFLAGS=$cmu_saved_CPPFLAGS
++
++
++
++cmu_saved_LDFLAGS=$LDFLAGS
++
++LDFLAGS="$LDFLAGS $LIB_SASL"
++
++echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
++echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6
++if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsasl2  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sasl_checkapop ();
++int
++main ()
++{
++sasl_checkapop ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_sasl2_sasl_checkapop=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_sasl2_sasl_checkapop=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
++echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6
++if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_APOP 
++_ACEOF
++
++else
++  { { echo "$as_me:$LINENO: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&5
++echo "$as_me: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++LDFLAGS=$cmu_saved_LDFLAGS
++
++
++
++# Check whether --with-perl or --without-perl was given.
++if test "${with_perl+set}" = set; then
++  withval="$with_perl"
++  with_perl="$withval"
++else
++  with_perl="perl"
++fi; 
++
++if test "${with_perl}" = yes; then
++    with_perl="perl"
++fi
++if test "${with_perl}" != no; then
++    if test ${using_static_sasl} = "staticonly"; then
++	{ echo "$as_me:$LINENO: WARNING: Cannot compile perl utilities using static libsasl" >&5
++echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
++	with_perl="no"
++    else 
++	for ac_prog in ${with_perl} perl
++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_PERL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$PERL"; then
++  ac_cv_prog_PERL="$PERL" # 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_PERL="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++PERL=$ac_cv_prog_PERL
++if test -n "$PERL"; then
++  echo "$as_me:$LINENO: result: $PERL" >&5
++echo "${ECHO_T}$PERL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$PERL" && break
++done
++test -n "$PERL" || PERL="with_perl=notfound"
++
++    fi
++fi
++if test "$with_perl" = "notfound"; then
++    { echo "$as_me:$LINENO: WARNING: Perl not found: Administrative tools won't be available" >&5
++echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
++elif test "${with_perl}" != "no"; then
++    EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
++    PERL_SUBDIRS="imap"
++    PERL="${with_perl}"
++    PERL_CCCDLFLAGS="$cccdlflags"
++    
++fi
++
++if test "$sievedir" != "no"; then
++	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
++
++	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
++	PERL_DEPSUBDIRS="sieve"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
++else
++	PERL_DEPSUBDIRS="none"
++fi
++
++echo "$as_me:$LINENO: checking for MD5Init" >&5
++echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
++if test "${ac_cv_func_MD5Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define MD5Init to an innocuous variant, in case <limits.h> declares MD5Init.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define MD5Init innocuous_MD5Init
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char MD5Init (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef MD5Init
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char MD5Init ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_MD5Init) || defined (__stub___MD5Init)
++choke me
++#else
++char (*f) () = MD5Init;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != MD5Init;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_MD5Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_MD5Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
++echo "${ECHO_T}$ac_cv_func_MD5Init" >&6
++if test $ac_cv_func_MD5Init = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
++echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6
++if test "${ac_cv_lib_md_MD5Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmd  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char MD5Init ();
++int
++main ()
++{
++MD5Init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_md_MD5Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_md_MD5Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
++echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6
++if test $ac_cv_lib_md_MD5Init = yes; then
++  LIBS="${LIBS} -lmd"
++else
++  MD5OBJ="md5.o"
++fi
++
++fi
++
++
++
++SNMP_SUBDIRS=""
++
++
++
++# Check whether --with-lib-subdir or --without-lib-subdir was given.
++if test "${with_lib_subdir+set}" = set; then
++  withval="$with_lib_subdir"
++  
++fi; 
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
++echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6
++if test "${ac_cv_cmu_lib_subdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
++test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
++if test "X$with_lib_subdir" = "X" ; then
++  ac_cv_cmu_lib_subdir=lib
++  if test $ac_cv_sizeof_long -eq 4 ; then
++    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
++  fi
++  if test $ac_cv_sizeof_long -eq 8 ; then
++    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
++  fi
++else
++  ac_cv_cmu_lib_subdir=$with_lib_subdir
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
++echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6
++CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
++
++
++
++
++  
++  
++# Check whether --with-libwrap or --without-libwrap was given.
++if test "${with_libwrap+set}" = set; then
++  withval="$with_libwrap"
++  with_libwrap=$withval
++else
++  with_libwrap=yes
++fi; 
++  if test "$with_libwrap" != no; then
++    if test -d "$with_libwrap"; then
++      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
++      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
++    fi
++    cmu_save_LIBS="$LIBS"
++    echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
++echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6
++if test "${ac_cv_lib_wrap_request_init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lwrap ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char request_init ();
++int
++main ()
++{
++request_init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_wrap_request_init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_wrap_request_init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
++echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6
++if test $ac_cv_lib_wrap_request_init = yes; then
++  
++		 if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for tcpd.h" >&5
++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
++if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking tcpd.h usability" >&5
++echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <tcpd.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking tcpd.h presence" >&5
++echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <tcpd.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: tcpd.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for tcpd.h" >&5
++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
++if test "${ac_cv_header_tcpd_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_tcpd_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
++
++fi
++if test $ac_cv_header_tcpd_h = yes; then
++  :
++else
++  with_libwrap=no
++fi
++
++
++else
++  with_libwrap=no
++fi
++
++    LIBS="$cmu_save_LIBS"
++  fi
++  echo "$as_me:$LINENO: checking libwrap support" >&5
++echo $ECHO_N "checking libwrap support... $ECHO_C" >&6
++  echo "$as_me:$LINENO: result: $with_libwrap" >&5
++echo "${ECHO_T}$with_libwrap" >&6
++  LIB_WRAP=""
++  if test "$with_libwrap" != no; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_LIBWRAP 
++_ACEOF
++
++    LIB_WRAP="-lwrap"
++    echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
++echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yp_get_default_domain ();
++int
++main ()
++{
++yp_get_default_domain ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_nsl_yp_get_default_domain=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_yp_get_default_domain=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
++if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
++  LIB_WRAP="${LIB_WRAP} -lnsl"
++fi
++
++  fi
++  
++
++
++
++  
++  
++# Check whether --with-snmp or --without-snmp was given.
++if test "${with_snmp+set}" = set; then
++  withval="$with_snmp"
++  with_snmp=$withval
++else
++  with_snmp=yes
++fi; 
++
++        
++# Check whether --with-ucdsnmp or --without-ucdsnmp was given.
++if test "${with_ucdsnmp+set}" = set; then
++  withval="$with_ucdsnmp"
++  with_snmp=$withval
++fi; 
++
++if test "$with_snmp" != "no"; then
++
++        if test "$with_snmp" = "yes"; then
++    # Extract the first word of "net-snmp-config", so it can be a program name with args.
++set dummy net-snmp-config; 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_path_SNMP_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $SNMP_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy="/usr/local/bin:$PATH"
++for as_dir in $as_dummy
++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_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
++
++if test -n "$SNMP_CONFIG"; then
++  echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
++echo "${ECHO_T}$SNMP_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
++  fi
++
++  if test -x "$SNMP_CONFIG"; then
++    echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
++echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6
++
++    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
++    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
++
++    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
++      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
++      LIB_UCDSNMP=$SNMP_LIBS
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NETSNMP 1
++_ACEOF
++
++      
++      echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++    else
++      echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
++echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
++    fi
++  else
++                if test "$with_snmp" != no; then
++      if test -d "$with_snmp"; then
++        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
++        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
++      fi
++      cmu_save_LIBS="$LIBS"
++      echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
++echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6
++if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sprint_objid ();
++int
++main ()
++{
++sprint_objid ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_snmp_sprint_objid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_snmp_sprint_objid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
++echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6
++if test $ac_cv_lib_snmp_sprint_objid = yes; then
++  
++  		 if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
++if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
++echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <ucd-snmp/version.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
++echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ucd-snmp/version.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
++if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
++
++fi
++if test $ac_cv_header_ucd_snmp_version_h = yes; then
++  :
++else
++  with_snmp=no
++fi
++
++
++else
++  with_snmp=no
++fi
++
++      LIBS="$cmu_save_LIBS"
++    fi
++    echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
++echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6
++    echo "$as_me:$LINENO: result: $with_snmp" >&5
++echo "${ECHO_T}$with_snmp" >&6
++    LIB_UCDSNMP=""
++    if test "$with_snmp" != no; then
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_UCDSNMP 1
++_ACEOF
++
++      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++      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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrpm -lpopt $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char rpmdbOpen ();
++int
++main ()
++{
++rpmdbOpen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_rpm_rpmdbOpen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_rpm_rpmdbOpen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6
++if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
++  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
++fi
++
++    fi
++    
++  fi
++fi
++
++
++
++# Figure out what directories we're linking against.
++# Lots of fun for the whole family.
++# This probably chokes on anything with spaces in it.
++# All we want is the list of -L directories, and -L may or may not be
++# followed by a space.
++isdir=no
++libpath=""
++#echo "debug ldflags: << ${ldflags} >>"
++#echo "debug default_ldflags: << ${default_ldflags} >>"
++for flag in ${ldflags} ${default_ldflags}; do
++  case $flag in
++    -L)
++      # it's a split -L option, we'll mark the next option as a dir.
++      isdir=yes
++      ;;
++
++    -L*) 
++      # attached -L option: split off the directory
++      larg=`echo $flag | sed -e 's:-L\(..*\):\1:'`
++      libpath="${libpath} ${larg}"
++      ;;
++
++    *)
++      if test $isdir = yes ; then
++	libpath="${libpath} ${flag}"
++	isdir=no
++      fi
++  esac
++done
++
++IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
++IMAP_LIBS="${LIB_SASL} ${LIBS}"
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++                                                                                          ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
++_ACEOF
++
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++{
++  (set) 2>&1 |
++    case `(ac_space=' '; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;;
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++} |
++  sed '
++     t clear
++     : clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     : end' >>confcache
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
++  if test -w $cache_file; then
++    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++    cat confcache >$cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/;
++s/:*\${srcdir}:*/:/;
++s/:*@srcdir@:*/:/;
++s/^\([^=]*=[	 ]*\):*/\1/;
++s/:*$//;
++s/^[^=]*=[	 ]*$//;
++}'
++fi
++
++DEFS=-DHAVE_CONFIG_H
++
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIB@&t@OBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++
++: ${CONFIG_STATUS=./config.status}
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate the current configuration.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
++
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# 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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++exec 6>&1
++
++# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.  Logging --version etc. is OK.
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
++@%:@@%:@ Running $as_me. @%:@@%:@
++_ASBOX
++} >&5
++cat >&5 <<_CSEOF
++
++This file was extended by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++_CSEOF
++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
++echo >&5
++_ACEOF
++
++# Files that config.status was made for.
++if test -n "$ac_config_files"; then
++  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_headers"; then
++  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_links"; then
++  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_commands"; then
++  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
++
++Usage: $0 [OPTIONS] [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
++  -d, --debug      don't remove temporary files
++      --recheck    update $as_me by reconfiguring in the same conditions
++  --file=FILE[:TEMPLATE]
++		   instantiate the configuration file FILE
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
++
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Report bugs to <bug-autoconf@gnu.org>."
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++ac_cs_version="\\
++config.status
++configured by $0, generated by GNU Autoconf 2.59,
++  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
++srcdir=$srcdir
++INSTALL="$INSTALL"
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value.  By we need to know if files were specified by the user.
++ac_need_defaults=:
++while test $# != 0
++do
++  case $1 in
++  --*=*)
++    ac_option=`expr "x$1" : 'x\([^=]*\)='`
++    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  *) # This is not an option, so the user has probably given explicit
++     # arguments.
++     ac_option=$1
++     ac_need_defaults=false;;
++  esac
++
++  case $ac_option in
++  # Handling of the options.
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --vers* | -V )
++    echo "$ac_cs_version"; exit 0 ;;
++  --he | --h)
++    # Conflict between --help and --header
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit 0 ;;
++  --debug | --d* | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; } ;;
++
++  *) ac_config_targets="$ac_config_targets $1" ;;
++
++  esac
++  shift
++done
++
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
++_ACEOF
++
++
++
++
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_config_target in $ac_config_targets
++do
++  case "$ac_config_target" in
++  # Handling of arguments.
++  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
++  "master/Makefile" ) CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
++  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
++  "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
++  "imtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
++  "netnews/Makefile" ) CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
++  "perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
++  "$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
++  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++fi
++
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++
++{
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./confstat$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++
++#
++# CONFIG_FILES section.
++#
++
++# No need to generate the scripts if there are no CONFIG_FILES.
++# This happens for instance when ./config.status config.h
++if test -n "\$CONFIG_FILES"; then
++  # Protect against being on the right side of a sed subst in config.status.
++  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@exec_prefix@,$exec_prefix,;t t
++s,@prefix@,$prefix,;t t
++s,@program_transform_name@,$program_transform_name,;t t
++s,@bindir@,$bindir,;t t
++s,@sbindir@,$sbindir,;t t
++s,@libexecdir@,$libexecdir,;t t
++s,@datadir@,$datadir,;t t
++s,@sysconfdir@,$sysconfdir,;t t
++s,@sharedstatedir@,$sharedstatedir,;t t
++s,@localstatedir@,$localstatedir,;t t
++s,@libdir@,$libdir,;t t
++s,@includedir@,$includedir,;t t
++s,@oldincludedir@,$oldincludedir,;t t
++s,@infodir@,$infodir,;t t
++s,@mandir@,$mandir,;t t
++s,@build_alias@,$build_alias,;t t
++s,@host_alias@,$host_alias,;t t
++s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
++s,@ECHO_C@,$ECHO_C,;t t
++s,@ECHO_N@,$ECHO_N,;t t
++s,@ECHO_T@,$ECHO_T,;t t
++s,@LIBS@,$LIBS,;t t
++s,@build@,$build,;t t
++s,@build_cpu@,$build_cpu,;t t
++s,@build_vendor@,$build_vendor,;t t
++s,@build_os@,$build_os,;t t
++s,@host@,$host,;t t
++s,@host_cpu@,$host_cpu,;t t
++s,@host_vendor@,$host_vendor,;t t
++s,@host_os@,$host_os,;t t
++s,@WARNERROR@,$WARNERROR,;t t
++s,@MAKEDEPEND@,$MAKEDEPEND,;t t
++s,@cyrus_prefix@,$cyrus_prefix,;t t
++s,@service_path@,$service_path,;t t
++s,@cyrus_user@,$cyrus_user,;t t
++s,@cyrus_group@,$cyrus_group,;t t
++s,@CC@,$CC,;t t
++s,@CFLAGS@,$CFLAGS,;t t
++s,@LDFLAGS@,$LDFLAGS,;t t
++s,@CPPFLAGS@,$CPPFLAGS,;t t
++s,@ac_ct_CC@,$ac_ct_CC,;t t
++s,@EXEEXT@,$EXEEXT,;t t
++s,@OBJEXT@,$OBJEXT,;t t
++s,@RANLIB@,$RANLIB,;t t
++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++s,@SET_MAKE@,$SET_MAKE,;t t
++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
++s,@AWK@,$AWK,;t t
++s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
++s,@LIB_SOCKET@,$LIB_SOCKET,;t t
++s,@IPV6_OBJS@,$IPV6_OBJS,;t t
++s,@PRE_SUBDIRS@,$PRE_SUBDIRS,;t t
++s,@EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t
++s,@DEPLIBS@,$DEPLIBS,;t t
++s,@LOCALDEFS@,$LOCALDEFS,;t t
++s,@BDB_INC@,$BDB_INC,;t t
++s,@BDB_LIB@,$BDB_LIB,;t t
++s,@CYRUSDB_OBJS@,$CYRUSDB_OBJS,;t t
++s,@SIEVE_OBJS@,$SIEVE_OBJS,;t t
++s,@SIEVE_LIBS@,$SIEVE_LIBS,;t t
++s,@SIEVE_CPPFLAGS@,$SIEVE_CPPFLAGS,;t t
++s,@YACC@,$YACC,;t t
++s,@LEX@,$LEX,;t t
++s,@LEXLIB@,$LEXLIB,;t t
++s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
++s,@SIEVE_SUBDIRS@,$SIEVE_SUBDIRS,;t t
++s,@WITH_NONBLOCK@,$WITH_NONBLOCK,;t t
++s,@WITH_GMTOFF@,$WITH_GMTOFF,;t t
++s,@WITH_MAP@,$WITH_MAP,;t t
++s,@WITH_LOCK@,$WITH_LOCK,;t t
++s,@cyrus_sigveclib@,$cyrus_sigveclib,;t t
++s,@AFS_LIBS@,$AFS_LIBS,;t t
++s,@AFS_LDFLAGS@,$AFS_LDFLAGS,;t t
++s,@LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t
++s,@LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t
++s,@LDAP_LIBS@,$LDAP_LIBS,;t t
++s,@SERVER_SUBDIRS@,$SERVER_SUBDIRS,;t t
++s,@OPENSSL_INC@,$OPENSSL_INC,;t t
++s,@OPENSSL_LIB@,$OPENSSL_LIB,;t t
++s,@ZEPHYR_LIBS@,$ZEPHYR_LIBS,;t t
++s,@ZEPHYR_CPPFLAGS@,$ZEPHYR_CPPFLAGS,;t t
++s,@WITH_IDLE@,$WITH_IDLE,;t t
++s,@IMAP_PROGS@,$IMAP_PROGS,;t t
++s,@COMPILE_ET@,$COMPILE_ET,;t t
++s,@COM_ERR_LIBS@,$COM_ERR_LIBS,;t t
++s,@COM_ERR_LDFLAGS@,$COM_ERR_LDFLAGS,;t t
++s,@COM_ERR_CPPFLAGS@,$COM_ERR_CPPFLAGS,;t t
++s,@LIB_CRYPT@,$LIB_CRYPT,;t t
++s,@GSSAPI_LIBS@,$GSSAPI_LIBS,;t t
++s,@GSSAPIBASE_LIBS@,$GSSAPIBASE_LIBS,;t t
++s,@LIB_DYN_SASL@,$LIB_DYN_SASL,;t t
++s,@DYNSASLFLAGS@,$DYNSASLFLAGS,;t t
++s,@LIB_SASL@,$LIB_SASL,;t t
++s,@SASLFLAGS@,$SASLFLAGS,;t t
++s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
++s,@MD5OBJ@,$MD5OBJ,;t t
++s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
++s,@CMU_LIB_SUBDIR@,$CMU_LIB_SUBDIR,;t t
++s,@LIB_WRAP@,$LIB_WRAP,;t t
++s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
++s,@LIB_UCDSNMP@,$LIB_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
++s,@PERL_SUBDIRS@,$PERL_SUBDIRS,;t t
++s,@PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++CEOF
++
++_ACEOF
++
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  # Split the substitutions into bite-sized pieces for seds with
++  # small command number limits, like on Digital OSF/1 and HP-UX.
++  ac_max_sed_lines=48
++  ac_sed_frag=1 # Number of current file.
++  ac_beg=1 # First line for current file.
++  ac_end=$ac_max_sed_lines # Line after last line for current file.
++  ac_more_lines=:
++  ac_sed_cmds=
++  while $ac_more_lines; do
++    if test $ac_beg -gt 1; then
++      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    else
++      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    fi
++    if test ! -s $tmp/subs.frag; then
++      ac_more_lines=false
++    else
++      # The purpose of the label and of the branching condition is to
++      # speed up the sed processing (if there are no `@' at all, there
++      # is no need to browse any of the substitutions).
++      # These are the two extra sed commands mentioned above.
++      (echo ':t
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++      if test -z "$ac_sed_cmds"; then
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++      else
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++      fi
++      ac_sed_frag=`expr $ac_sed_frag + 1`
++      ac_beg=$ac_end
++      ac_end=`expr $ac_end + $ac_max_sed_lines`
++    fi
++  done
++  if test -z "$ac_sed_cmds"; then
++    ac_sed_cmds=cat
++  fi
++fi # test -n "$CONFIG_FILES"
++
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++  ac_dir=`(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'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  esac
++
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++				     sed 's,.*/,,'` by configure."
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
++$extrasub
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++:t
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++s,@configure_input@,$configure_input,;t t
++s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
++s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
++s,@INSTALL@,$ac_INSTALL,;t t
++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
++  rm -f $tmp/stdin
++  if test x"$ac_file" != x-; then
++    mv $tmp/out $ac_file
++  else
++    cat $tmp/out
++    rm -f $tmp/out
++  fi
++
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_HEADER section.
++#
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
++ac_dC=' '
++ac_dD=',;t'
++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
++ac_uB='$,\1#\2define\3'
++ac_uC=' '
++ac_uD=',;t'
++
++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++  # Remove the trailing spaces.
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
++
++_ACEOF
++
++# Transform confdefs.h into two sed scripts, `conftest.defines' and
++# `conftest.undefs', that substitutes the proper values into
++# config.h.in to produce config.h.  The first handles `#define'
++# templates, and the second `#undef' templates.
++# And first: Protect against being on the right side of a sed subst in
++# config.status.  Protect against being in an unquoted here document
++# in config.status.
++rm -f conftest.defines conftest.undefs
++# Using a here document instead of a string reduces the quoting nightmare.
++# Putting comments in sed scripts is not portable.
++#
++# `end' is used to avoid that the second main sed command (meant for
++# 0-ary CPP macros) applies to n-ary macro definitions.
++# See the Autoconf documentation for `clear'.
++cat >confdef2sed.sed <<\_ACEOF
++s/[\\&,]/\\&/g
++s,[\\$`],\\&,g
++t clear
++: clear
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++t end
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++: end
++_ACEOF
++# If some macros were called several times there might be several times
++# the same #defines, which is useless.  Nevertheless, we may not want to
++# sort them, since we want the *last* AC-DEFINE to be honored.
++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
++rm -f confdef2sed.sed
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >>conftest.undefs <<\_ACEOF
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++_ACEOF
++
++# Break up conftest.defines because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
++echo '  :' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.defines >/dev/null
++do
++  # Write a limited-size here document to $tmp/defines.sed.
++  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#define' lines.
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/defines.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines
++echo '  fi # grep' >>$CONFIG_STATUS
++echo >>$CONFIG_STATUS
++
++# Break up conftest.undefs because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.undefs >/dev/null
++do
++  # Write a limited-size here document to $tmp/undefs.sed.
++  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#undef'
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
++  rm -f conftest.undefs
++  mv conftest.tail conftest.undefs
++done
++rm -f conftest.undefs
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    echo "/* Generated by configure.  */" >$tmp/config.h
++  else
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
++  fi
++  cat $tmp/in >>$tmp/config.h
++  rm -f $tmp/in
++  if test x"$ac_file" != x-; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
++    else
++      ac_dir=`(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'`
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++      rm -f $ac_file
++      mv $tmp/config.h $ac_file
++    fi
++  else
++    cat $tmp/config.h
++    rm -f $tmp/config.h
++  fi
++done
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++{ (exit 0); exit 0; }
++_ACEOF
++chmod +x $CONFIG_STATUS
++ac_clean_files=$ac_clean_files_save
++
++
++# configure is writing to config.log, and then calls config.status.
++# config.status does its own redirection, appending to config.log.
++# Unfortunately, on DOS this fails, as config.log is still kept open
++# by configure, so config.status won't be able to write to it; its
++# output is simply discarded.  So we exec the FD to /dev/null,
++# effectively closing config.log, so it can be properly (re)opened and
++# appended to by config.status.  When coming back to configure, we
++# need to make the FD available again.
++if test "$no_create" != yes; then
++  ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
++  exec 5>/dev/null
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
++  exec 5>>config.log
++  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
++  # would make configure fail if this is the last instruction.
++  $ac_cs_success || { (exit 1); exit 1; }
++fi
++
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/requests /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests
+--- cyrus-imapd-2.2.13/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests	2006-05-19 15:21:36.435312657 +0200
+@@ -0,0 +1,293 @@
++# This file was generated by Autom4te Sat Jan  8 16:59:54 PST 2005.
++# It contains the lists of macros which have been traced.
++# It can be safely removed.
++
++@request = (
++             bless( [
++                      '0',
++                      1,
++                      [
++                        '/usr/share/autoconf'
++                      ],
++                      [
++                        '/usr/share/autoconf/autoconf/autoconf.m4f',
++                        '/usr/share/aclocal/isc-posix.m4',
++                        'cmulocal/afs.m4',
++                        'cmulocal/berkdb.m4',
++                        'cmulocal/bsd_sockets.m4',
++                        'cmulocal/c-attribute.m4',
++                        'cmulocal/c-fpic.m4',
++                        'cmulocal/common.m4',
++                        'cmulocal/cyrus.m4',
++                        'cmulocal/ipv6.m4',
++                        'cmulocal/kerberos_v4.m4',
++                        'cmulocal/libssl.m4',
++                        'cmulocal/libwrap.m4',
++                        'cmulocal/sasl2.m4',
++                        'cmulocal/ucdsnmp.m4',
++                        'configure.in'
++                      ],
++                      {
++                        'CMU_USE_DB' => 1,
++                        'AC_C_VOLATILE' => 1,
++                        'AC_TYPE_OFF_T' => 1,
++                        'CMU_DB_LIB_WHERE' => 1,
++                        'AC_FUNC_CLOSEDIR_VOID' => 1,
++                        'AC_REPLACE_FNMATCH' => 1,
++                        'AC_DEFUN' => 1,
++                        'AC_PROG_LIBTOOL' => 1,
++                        'AC_FUNC_STAT' => 1,
++                        'AC_FUNC_WAIT3' => 1,
++                        'AC_FUNC_LSTAT' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AC_FUNC_STRTOD' => 1,
++                        'AC_CHECK_HEADERS' => 1,
++                        'CMU_LIBSSL_LIB_WHERE1' => 1,
++                        'AC_FUNC_STRNLEN' => 1,
++                        'AC_PROG_CXX' => 1,
++                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
++                        'CMU_KRB4_32_DEFN' => 1,
++                        'AC_PROG_AWK' => 1,
++                        '_m4_warn' => 1,
++                        'CMU_LIBSSL_LIB_WHERE' => 1,
++                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
++                        'AC_HEADER_MAJOR' => 1,
++                        'CMU_SASL2_REQUIRE_VER' => 1,
++                        'CMU_KRB_INC_WHERE' => 1,
++                        'AC_PROG_GCC_TRADITIONAL' => 1,
++                        'IPv6_CHECK_FUNC' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        'AC_STRUCT_ST_BLOCKS' => 1,
++                        'AC_PROG_MAKE_SET' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'sinclude' => 1,
++                        'AC_FUNC_STRERROR_R' => 1,
++                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
++                        'AC_DECL_SYS_SIGLIST' => 1,
++                        'AC_FUNC_FORK' => 1,
++                        'CMU_KRB_INC_WHERE1' => 1,
++                        'CYRUS_BERKELEY_DB_OPTS' => 1,
++                        'AU_DEFUN' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
++                        'IPv6_CHECK_SOCKLEN_T' => 1,
++                        'AC_INIT' => 1,
++                        'AC_STRUCT_TIMEZONE' => 1,
++                        'CMU_AFS' => 1,
++                        'AC_SUBST' => 1,
++                        'AC_FUNC_ALLOCA' => 1,
++                        'IPv6_CHECK_SA_LEN' => 1,
++                        'CMU_LIBSSL' => 1,
++                        'AC_CANONICAL_HOST' => 1,
++                        'AC_PROG_RANLIB' => 1,
++                        'CMU_UCDSNMP' => 1,
++                        'AC_FUNC_SETPGRP' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
++                        'AC_FUNC_MMAP' => 1,
++                        'AC_TYPE_SIZE_T' => 1,
++                        'IPv6_CHECK_SS_FAMILY' => 1,
++                        'AC_CHECK_TYPES' => 1,
++                        'AC_CHECK_MEMBERS' => 1,
++                        'AC_DEFUN_ONCE' => 1,
++                        'AC_FUNC_UTIME_NULL' => 1,
++                        'AC_FUNC_SELECT_ARGTYPES' => 1,
++                        'CMU_AFS_WHERE' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
++                        'AC_HEADER_STAT' => 1,
++                        'CMU_LIBSSL_INC_WHERE1' => 1,
++                        'AC_C_INLINE' => 1,
++                        'CMU_C___ATTRIBUTE__' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        'include' => 1,
++                        'AM_GNU_GETTEXT' => 1,
++                        'AC_CHECK_LIB' => 1,
++                        'CMU_KRB_LIB_WHERE1' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
++                        'CMU_TEST_INCPATH' => 1,
++                        'AC_FUNC_MALLOC' => 1,
++                        'CMU_ADD_LIBPATH' => 1,
++                        'AC_FUNC_GETGROUPS' => 1,
++                        'AC_FUNC_GETLOADAVG' => 1,
++                        'AC_FUNC_FSEEKO' => 1,
++                        'SASL_GSSAPI_CHK' => 1,
++                        'CMU_CHECK_HEADER_NOCACHE' => 1,
++                        'AM_PROG_CC_C_O' => 1,
++                        'CYRUS_BERKELEY_DB_CHK' => 1,
++                        'AC_FUNC_MKTIME' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_HEADER_SYS_WAIT' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
++                        'AC_PROG_LN_S' => 1,
++                        'm4_include' => 1,
++                        'AC_HEADER_DIRENT' => 1,
++                        'CMU_KRB_RD_REQ_PROTO' => 1,
++                        'm4_pattern_forbid' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
++                        'CMU_FIND_LIB_SUBDIR' => 1,
++                        'AC_HEADER_TIME' => 1,
++                        'CMU_SOCKETS' => 1,
++                        'AC_FUNC_GETMNTENT' => 1,
++                        'AC_TYPE_MODE_T' => 1,
++                        'm4_sinclude' => 1,
++                        'CMU_ADD_LIBPATH_TO' => 1,
++                        'AC_PATH_X' => 1,
++                        'CMU_DB3_LIB_WHERE1' => 1,
++                        'CMU_AFS_LIB_WHERE1' => 1,
++                        'CMU_SASL2_REQUIRED' => 1,
++                        'AC_HEADER_STDC' => 1,
++                        'CMU_TEST_LIBPATH' => 1,
++                        'CMU_AFS_INC_WHERE1' => 1,
++                        'AC_FUNC_ERROR_AT_LINE' => 1,
++                        'CMU_LIBSSL_INC_WHERE' => 1,
++                        'AC_FUNC_MBRTOWC' => 1,
++                        'AC_TYPE_SIGNAL' => 1,
++                        'SASL2_CRYPT_CHK' => 1,
++                        'AC_TYPE_UID_T' => 1,
++                        'm4_pattern_allow' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
++                        'CMU_KRB_SET_KEY_PROTO' => 1,
++                        'AC_PROG_CC' => 1,
++                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_PROG_YACC' => 1,
++                        'AC_FUNC_CHOWN' => 1,
++                        'AC_FUNC_GETPGRP' => 1,
++                        'CMU_DB_INC_WHERE' => 1,
++                        'AM_INIT_AUTOMAKE' => 1,
++                        'CMU_DB4_LIB_WHERE1' => 1,
++                        'SASL_SET_GSSAPI_LIBS' => 1,
++                        'AC_FUNC_REALLOC' => 1,
++                        'CMU_KRB_SENDAUTH_PROTO' => 1,
++                        'CMU_KRB_LIB_WHERE' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AM_MAINTAINER_MODE' => 1,
++                        'CMU_SASL2' => 1,
++                        'AC_PROG_CPP' => 1,
++                        'CMU_DB_INC_WHERE1' => 1,
++                        'AC_TYPE_PID_T' => 1,
++                        'AC_PROG_LEX' => 1,
++                        'AC_C_CONST' => 1,
++                        'CMU_LIBWRAP' => 1,
++                        'AC_FUNC_SETVBUF_REVERSED' => 1,
++                        'AC_PROG_INSTALL' => 1,
++                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
++                        'CMU_C_FPIC' => 1,
++                        'CMU_KRB4' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_ISC_POSIX' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AC_CONFIG_HEADERS' => 1,
++                        'CMU_NEEDS_AFS' => 1,
++                        'AC_CHECK_FUNCS' => 1
++                      }
++                    ], 'Autom4te::Request' ),
++             bless( [
++                      '1',
++                      1,
++                      [
++                        '/usr/share/autoconf'
++                      ],
++                      [
++                        '/usr/share/autoconf/autoconf/autoconf.m4f',
++                        'aclocal.m4',
++                        'configure.in'
++                      ],
++                      {
++                        'm4_pattern_forbid' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
++                        'AC_TYPE_OFF_T' => 1,
++                        'AC_C_VOLATILE' => 1,
++                        'AC_FUNC_CLOSEDIR_VOID' => 1,
++                        'AC_REPLACE_FNMATCH' => 1,
++                        'AC_PROG_LIBTOOL' => 1,
++                        'AC_FUNC_STAT' => 1,
++                        'AC_HEADER_TIME' => 1,
++                        'AC_FUNC_WAIT3' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AC_FUNC_LSTAT' => 1,
++                        'AC_TYPE_MODE_T' => 1,
++                        'AC_FUNC_GETMNTENT' => 1,
++                        'AC_FUNC_STRTOD' => 1,
++                        'AC_CHECK_HEADERS' => 1,
++                        'AC_FUNC_STRNLEN' => 1,
++                        'm4_sinclude' => 1,
++                        'AC_PROG_CXX' => 1,
++                        'AC_PATH_X' => 1,
++                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
++                        'AC_PROG_AWK' => 1,
++                        '_m4_warn' => 1,
++                        'AC_HEADER_STDC' => 1,
++                        'AC_HEADER_MAJOR' => 1,
++                        'AC_FUNC_ERROR_AT_LINE' => 1,
++                        'AC_PROG_GCC_TRADITIONAL' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        'AC_FUNC_MBRTOWC' => 1,
++                        'AC_STRUCT_ST_BLOCKS' => 1,
++                        'AC_TYPE_SIGNAL' => 1,
++                        'AC_TYPE_UID_T' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'AC_PROG_MAKE_SET' => 1,
++                        'sinclude' => 1,
++                        'm4_pattern_allow' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
++                        'AC_FUNC_STRERROR_R' => 1,
++                        'AC_PROG_CC' => 1,
++                        'AC_DECL_SYS_SIGLIST' => 1,
++                        'AC_FUNC_FORK' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
++                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_PROG_YACC' => 1,
++                        'AC_INIT' => 1,
++                        'AC_STRUCT_TIMEZONE' => 1,
++                        'AC_FUNC_CHOWN' => 1,
++                        'AC_SUBST' => 1,
++                        'AC_FUNC_ALLOCA' => 1,
++                        'AC_CANONICAL_HOST' => 1,
++                        'AC_FUNC_GETPGRP' => 1,
++                        'AC_PROG_RANLIB' => 1,
++                        'AM_INIT_AUTOMAKE' => 1,
++                        'AC_FUNC_SETPGRP' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
++                        'AC_FUNC_MMAP' => 1,
++                        'AC_FUNC_REALLOC' => 1,
++                        'AC_TYPE_SIZE_T' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AC_CHECK_TYPES' => 1,
++                        'AC_CHECK_MEMBERS' => 1,
++                        'AM_MAINTAINER_MODE' => 1,
++                        'AC_FUNC_UTIME_NULL' => 1,
++                        'AC_FUNC_SELECT_ARGTYPES' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
++                        'AC_HEADER_STAT' => 1,
++                        'AC_C_INLINE' => 1,
++                        'AC_PROG_CPP' => 1,
++                        'AC_TYPE_PID_T' => 1,
++                        'AC_C_CONST' => 1,
++                        'AC_PROG_LEX' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        'include' => 1,
++                        'AC_FUNC_SETVBUF_REVERSED' => 1,
++                        'AC_PROG_INSTALL' => 1,
++                        'AM_GNU_GETTEXT' => 1,
++                        'AC_CHECK_LIB' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
++                        'AC_FUNC_MALLOC' => 1,
++                        'AC_FUNC_GETGROUPS' => 1,
++                        'AC_FUNC_GETLOADAVG' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_FUNC_FSEEKO' => 1,
++                        'AM_PROG_CC_C_O' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AC_FUNC_MKTIME' => 1,
++                        'AC_CONFIG_HEADERS' => 1,
++                        'AC_HEADER_SYS_WAIT' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
++                        'AC_PROG_LN_S' => 1,
++                        'm4_include' => 1,
++                        'AC_HEADER_DIRENT' => 1,
++                        'AC_CHECK_FUNCS' => 1
++                      }
++                    ], 'Autom4te::Request' )
++           );
++
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0
+--- cyrus-imapd-2.2.13/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0	2006-05-19 15:21:21.140750352 +0200
+@@ -0,0 +1,2900 @@
++m4trace:/usr/share/aclocal/isc-posix.m4:24: -1- AC_DEFUN([AC_ISC_POSIX], [
++    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
++    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
++  
++])
++m4trace:cmulocal/afs.m4:19: -1- AC_DEFUN([CMU_AFS_INC_WHERE1], [
++cmu_save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$cmu_save_CPPFLAGS -I$1"
++AC_TRY_COMPILE([#include <afs/param.h>],
++[#ifndef SYS_NAME
++choke me
++#endif
++int foo;],
++ac_cv_found_afs_inc=yes,
++ac_cv_found_afs_inc=no)
++CPPFLAGS=$cmu_save_CPPFLAGS
++])
++m4trace:cmulocal/afs.m4:31: -1- AC_DEFUN([CMU_AFS_LIB_WHERE1], [
++save_LIBS="$LIBS"
++save_LDFLAGS="$LDFLAGS"
++
++LIBS="-lauth $1/afs/util.a $LIB_SOCKET $LIBS"
++LDFLAGS="-L$1 -L$1/afs $LDFLAGS"
++dnl suppress caching
++AC_TRY_LINK([],[afsconf_Open();], ac_cv_found_afs_lib=yes, ac_cv_found_afs_lib=no)
++LIBS="$save_LIBS"
++LDFLAGS="$save_LDFLAGS"
++])
++m4trace:cmulocal/afs.m4:54: -1- AC_DEFUN([CMU_AFS_WHERE], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++   for i in $1; do
++      AC_MSG_CHECKING(for AFS in $i)
++      CMU_AFS_INC_WHERE1("$i/include")
++      ac_cv_found_lwp_inc=$ac_cv_found_afs_inc
++      CMU_TEST_INCPATH($i/include, lwp) 
++      ac_cv_found_afs_inc=$ac_cv_found_lwp_inc
++      if test "$ac_cv_found_afs_inc" = "yes"; then
++        CMU_AFS_LIB_WHERE1("$i/$CMU_LIB_SUBDIR")
++        if test "$ac_cv_found_afs_lib" = "yes"; then
++          ac_cv_afs_where=$i
++          AC_MSG_RESULT(found)
++          break
++        else
++          AC_MSG_RESULT(not found)
++        fi
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/afs.m4:308: -1- AC_DEFUN([CMU_AFS], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++AC_REQUIRE([CMU_SOCKETS])
++AC_REQUIRE([CMU_LIBSSL])
++AC_ARG_WITH(AFS,
++	[  --with-afs=PREFIX      Compile with AFS support],
++	[if test "X$with_AFS" = "X"; then
++		with_AFS=yes
++	fi])
++
++	if test "X$with_AFS" != "X"; then
++	  ac_cv_afs_where=$with_AFS
++	fi
++	if test "X$ac_cv_afs_where" = "X"; then
++	  CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
++	fi
++
++	AC_MSG_CHECKING(whether to include AFS)
++	if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
++	  ac_cv_found_afs=no
++	  AC_MSG_RESULT(no)
++	else
++	  ac_cv_found_afs=yes
++	  AC_MSG_RESULT(yes)
++	  AFS_INC_DIR="$ac_cv_afs_where/include"
++	  AFS_LIB_DIR="$ac_cv_afs_where/$CMU_LIB_SUBDIR"
++	  AFS_TOP_DIR="$ac_cv_afs_where"
++	  AFS_INC_FLAGS="-I${AFS_INC_DIR}"
++          AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs"
++          cmu_save_LIBS="$LIBS"
++          cmu_save_CPPFLAGS="$CPPFLAGS"
++          CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}"
++	  cmu_save_LDFLAGS="$LDFLAGS"
++ 	  LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
++                        
++          AC_CHECK_HEADERS(afs/stds.h)
++
++          AC_MSG_CHECKING([if libdes is needed])
++          AC_TRY_LINK([],[des_quad_cksum();],AFS_DES_LIB="",AFS_DES_LIB="maybe")
++          if test "X$AFS_DES_LIB" != "X"; then
++              LIBS="$cmu_save_LIBS -ldes"
++              AC_TRY_LINK([], [des_quad_cksum();],AFS_DES_LIB="yes")
++              if test "X$AFS_DES_LIB" = "Xyes"; then
++                  AC_MSG_RESULT([yes])
++    	          AFS_LIBDES="-ldes"
++    	          AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
++    	      else
++   	          LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
++ 	          AC_TRY_LINK([],
++	          [des_quad_cksum();],AFS_DES_LIB="libcrypto")
++	          if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
++	              AC_MSG_RESULT([libcrypto])
++		      AFS_LIBDES="$LIBSSL_LIB_FLAGS"
++	              AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
++    	          else
++   	              LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++ 	              AC_TRY_LINK([],
++	              [des_quad_cksum();],AFS_DES_LIB="libcrypto+descompat")
++	              if test "X$AFS_DES_LIB" = "Xlibcrypto+descompat"; then
++	                  AC_MSG_RESULT([libcrypto+descompat])
++		          AFS_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++	                  AFS_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++	              else
++         	          AC_MSG_RESULT([unknown])
++	                  AC_MSG_ERROR([Could not use -ldes])
++	              fi 
++	          fi 
++	      fi 
++	  else
++             AC_MSG_RESULT([no])
++          fi
++
++
++	  AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
++          AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
++	  AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
++	  AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
++          AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a"
++
++          LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
++          AC_CHECK_FUNC(des_pcbc_init)
++          if test "X$ac_cv_func_des_pcbc_init" != "Xyes"; then
++           AC_CHECK_LIB(descompat, des_pcbc_init, AFS_DESCOMPAT_LIB="-ldescompat")
++           if test "X$AFS_DESCOMPAT_LIB" != "X" ; then
++                AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_DESCOMPAT_LIB"
++                AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_DESCOMPAT_LIB"
++                AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_DESCOMPAT_LIB"
++                AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_DESCOMPAT_LIB"
++           else
++
++           AC_MSG_CHECKING([if rxkad needs des_pcbc_init])
++           AC_TRY_LINK(,[tkt_DecodeTicket();],RXKAD_PROBLEM=no,RXKAD_PROBLEM=maybe)
++            if test "$RXKAD_PROBLEM" = "maybe"; then
++              AC_TRY_LINK([int des_pcbc_init() { return 0;}],
++              [tkt_DecodeTicket();],RXKAD_PROBLEM=yes,RXKAD_PROBLEM=error)
++              if test "$RXKAD_PROBLEM" = "yes"; then
++                    AC_MSG_RESULT([yes])
++                    AC_MSG_ERROR([cannot use rxkad])
++              else
++                    AC_MSG_RESULT([unknown])        
++                    AC_MSG_ERROR([Unknown error testing rxkad])
++              fi
++            else
++              AC_MSG_RESULT([no])
++            fi
++           fi
++          fi
++
++          LIBS="$cmu_save_LIBS"
++          AC_CHECK_FUNC(flock)
++          LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
++          if test "X$ac_cv_func_flock" != "Xyes"; then
++             AC_MSG_CHECKING([if AFS needs flock])
++             AC_TRY_LINK([#include <afs/param.h>
++#ifdef HAVE_AFS_STDS_H
++#include <afs/stds.h>
++#endif
++#include <ubik.h>
++#include <afs/cellconfig.h>
++#include <afs/auth.h>
++#include <afs/volser.h>
++struct ubik_client * cstruct;
++int sigvec() {return 0;}
++extern int UV_SetSecurity();],
++             [vsu_ClientInit(1,"","",0,
++                             &cstruct,UV_SetSecurity)],
++             AFS_FLOCK=no,AFS_FLOCK=yes)
++             if test $AFS_FLOCK = "no"; then
++                AC_MSG_RESULT([no])
++             else
++               AC_MSG_RESULT([yes])
++               LDFLAGS="$LDFLAGS -L/usr/ucblib"
++               AC_CHECK_LIB(ucb, flock,:, [AC_CHECK_LIB(BSD, flock)])
++             fi
++          fi
++          LIBS="$cmu_save_LIBS"
++          AC_CHECK_FUNC(sigvec)
++          LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
++          if test "X$ac_cv_func_sigvec" != "Xyes"; then
++             AC_MSG_CHECKING([if AFS needs sigvec])
++             AC_TRY_LINK([#include <afs/param.h>
++#ifdef HAVE_AFS_STDS_H
++#include <afs/stds.h>
++#endif
++#include <ubik.h>
++#include <afs/cellconfig.h>
++#include <afs/auth.h>
++#include <afs/volser.h>
++struct ubik_client * cstruct;
++int flock() {return 0;}
++extern int UV_SetSecurity();],
++             [vsu_ClientInit(1,"","",0,
++                             &cstruct,UV_SetSecurity)],
++             AFS_SIGVEC=no,AFS_SIGVEC=yes)
++             if test $AFS_SIGVEC = "no"; then
++                AC_MSG_RESULT([no])
++             else
++               AC_MSG_RESULT([yes])
++               LDFLAGS="$LDFLAGS -L/usr/ucblib"
++               AC_CHECK_LIB(ucb, sigvec,:,[AC_CHECK_LIB(BSD, sigvec)])
++             fi
++          fi
++          if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
++             AFS_LIB_FLAGS="${AFS_LIB_FLAGS} -L/usr/ucblib -R/usr/ucblib"
++          fi
++          if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
++             AFS_BSD_LIB="-lucb"
++          elif test "$ac_cv_lib_BSD_flock" = "yes" -o "$ac_cv_lib_BSD_sigvec" = "yes"; then
++             AFS_BSD_LIB="-lBSD"
++          fi
++          if test "X$AFS_BSD_LIB" != "X" ; then
++                AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_BSD_LIB"
++                AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_BSD_LIB"
++                AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
++                AFS_RX_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
++                AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_BSD_LIB"
++          fi
++
++          AC_MSG_CHECKING([if libaudit is needed])
++	  AFS_LIBAUDIT=""
++          LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
++          AC_TRY_LINK([#include <afs/param.h>
++#ifdef HAVE_AFS_STDS_H
++#include <afs/stds.h>
++#endif
++#include <afs/cellconfig.h>
++#include <afs/auth.h>],
++          [afsconf_SuperUser();],AFS_AUDIT_LIB="",AFS_AUDIT_LIB="maybe")
++          if test "X$AFS_AUDIT_LIB" != "X"; then
++          LIBS="$cmu_save_LIBS -lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB $LIB_SOCKET"
++             AC_TRY_LINK([#include <afs/param.h>
++#ifdef HAVE_AFS_STDS_H
++#include <afs/stds.h>
++#endif
++#include <afs/cellconfig.h>
++#include <afs/auth.h>],
++             [afsconf_SuperUser();],AFS_AUDIT_LIB="yes")
++             if test "X$AFS_AUDIT_LIB" = "Xyes"; then
++                 AC_MSG_RESULT([yes])
++	         AFS_LIBAUDIT="-laudit"
++	         AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
++                 AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
++                 AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
++             else
++                 AC_MSG_RESULT([unknown])
++                 AC_MSG_ERROR([Could not use -lauth while testing for -laudit])
++             fi 
++          else
++             AC_MSG_RESULT([no])
++          fi
++
++	  AC_CHECK_FUNCS(VL_ProbeServer)
++          AC_MSG_CHECKING([if new-style afs_ integer types are defined])
++          AC_CACHE_VAL(ac_cv_afs_int32,
++dnl The next few lines contain a quoted argument to egrep
++dnl It is critical that there be no leading or trailing whitespace
++dnl or newlines
++[AC_EGREP_CPP(dnl
++changequote(<<,>>)dnl
++<<(^|[^a-zA-Z_0-9])afs_int32[^a-zA-Z_0-9]>>dnl
++changequote([,]), [#include <afs/param.h>
++#ifdef HAVE_AFS_STDS_H
++#include <afs/stds.h>
++#endif],
++ac_cv_afs_int32=yes, ac_cv_afs_int32=no)])
++          AC_MSG_RESULT($ac_cv_afs_int32)
++          if test $ac_cv_afs_int32 = yes ; then
++            AC_DEFINE(HAVE_AFS_INT32,, [AFS provides new "unambiguous" type names])
++          else
++            AC_DEFINE(afs_int16, int16, [it's a type definition])
++            AC_DEFINE(afs_int32, int32, [it's a type definition])
++            AC_DEFINE(afs_uint16, u_int16, [it's a type definition])
++            AC_DEFINE(afs_uint32, u_int32, [it's a type definition])
++          fi
++
++          CPPFLAGS="${cmu_save_CPPFLAGS}"
++          LDFLAGS="${cmu_save_LDFLAGS}"
++          LIBS="${cmu_save_LIBS}"
++	  AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)])
++          AC_DEFINE(AFS,, [Use AFS. (find what needs this and nuke it)])
++          AC_SUBST(AFS_CLIENT_LIBS_STATIC)
++          AC_SUBST(AFS_KTC_LIBS_STATIC)
++          AC_SUBST(AFS_CLIENT_LIBS)
++          AC_SUBST(AFS_RX_LIBS)
++          AC_SUBST(AFS_KTC_LIBS)
++          AC_SUBST(AFS_INC_FLAGS)
++          AC_SUBST(AFS_LIB_FLAGS)
++	  AC_SUBST(AFS_TOP_DIR)
++	  AC_SUBST(AFS_LIBAUDIT)
++	  AC_SUBST(AFS_LIBDES)
++          AC_SUBST(AFS_LIBDESA)
++       	fi
++	])
++m4trace:cmulocal/afs.m4:314: -1- AC_DEFUN([CMU_NEEDS_AFS], [AC_REQUIRE([CMU_AFS])
++if test "$ac_cv_found_afs" != "yes"; then
++        AC_ERROR([Cannot continue without AFS])
++fi])
++m4trace:cmulocal/berkdb.m4:13: -1- AC_DEFUN([CMU_DB_INC_WHERE1], [
++saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$saved_CPPFLAGS -I$1"
++AC_TRY_COMPILE([#include <db.h>],
++[DB *db;
++db_create(&db, NULL, 0);
++db->open(db, "foo.db", NULL, DB_UNKNOWN, DB_RDONLY, 0644);],
++ac_cv_found_db_inc=yes,
++ac_cv_found_db_inc=no)
++CPPFLAGS=$saved_CPPFLAGS
++])
++m4trace:cmulocal/berkdb.m4:28: -1- AC_DEFUN([CMU_DB_INC_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for db headers in $i)
++      CMU_DB_INC_WHERE1($i)
++      CMU_TEST_INCPATH($i, db)
++      if test "$ac_cv_found_db_inc" = "yes"; then
++        ac_cv_db_where_inc=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/berkdb.m4:44: -1- AC_DEFUN([CMU_DB3_LIB_WHERE1], [
++AC_REQUIRE([CMU_AFS])
++AC_REQUIRE([CMU_KRB4])
++saved_LIBS=$LIBS
++  LIBS="$saved_LIBS -L$1 -ldb-3"
++AC_TRY_LINK([#include <db.h>],
++[db_env_create(NULL, 0);],
++[ac_cv_found_db_3_lib=yes],
++ac_cv_found_db_3_lib=no)
++LIBS=$saved_LIBS
++])
++m4trace:cmulocal/berkdb.m4:55: -1- AC_DEFUN([CMU_DB4_LIB_WHERE1], [
++AC_REQUIRE([CMU_AFS])
++AC_REQUIRE([CMU_KRB4])
++saved_LIBS=$LIBS
++LIBS="$saved_LIBS -L$1 -ldb-4"
++AC_TRY_LINK([#include <db.h>],
++[db_env_create(NULL, 0);],
++[ac_cv_found_db_4_lib=yes],
++ac_cv_found_db_4_lib=no)
++LIBS=$saved_LIBS
++])
++m4trace:cmulocal/berkdb.m4:77: -1- AC_DEFUN([CMU_DB_LIB_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for db libraries in $i)
++if test "$enable_db4" = "yes"; then
++      CMU_DB4_LIB_WHERE1($i)
++      CMU_TEST_LIBPATH($i, [db-4])
++      ac_cv_found_db_lib=$ac_cv_found_db_4_lib
++else
++      CMU_DB3_LIB_WHERE1($i)
++      CMU_TEST_LIBPATH($i, [db-3])
++      ac_cv_found_db_lib=$ac_cv_found_db_3_lib
++fi
++      if test "$ac_cv_found_db_lib" = "yes" ; then
++        ac_cv_db_where_lib=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/berkdb.m4:178: -1- AC_DEFUN([CMU_USE_DB], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++AC_ARG_WITH(db,
++	[  --with-db=PREFIX      Compile with db support],
++	[if test "X$with_db" = "X"; then
++		with_db=yes
++	fi])
++AC_ARG_WITH(db-lib,
++	[  --with-db-lib=dir     use db libraries in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-db-lib])
++	fi])
++AC_ARG_WITH(db-include,
++	[  --with-db-include=dir use db headers in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-db-include])
++	fi])
++AC_ARG_ENABLE(db4,
++	[  --enable-db4          use db 4.x libraries])
++	
++	if test "X$with_db" != "X"; then
++	  if test "$with_db" != "yes"; then
++	    ac_cv_db_where_lib=$with_db/$CMU_LIB_SUBDIR
++	    ac_cv_db_where_inc=$with_db/include
++	  fi
++	fi
++
++	if test "X$with_db_lib" != "X"; then
++	  ac_cv_db_where_lib=$with_db_lib
++	fi
++	if test "X$ac_cv_db_where_lib" = "X"; then
++	  CMU_DB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR)
++	fi
++
++	if test "X$with_db_include" != "X"; then
++	  ac_cv_db_where_inc=$with_db_include
++	fi
++	if test "X$ac_cv_db_where_inc" = "X"; then
++	  CMU_DB_INC_WHERE(/usr/athena/include /usr/local/include)
++	fi
++
++	AC_MSG_CHECKING(whether to include db)
++	if test "X$ac_cv_db_where_lib" = "X" -o "X$ac_cv_db_where_inc" = "X"; then
++	  ac_cv_found_db=no
++	  AC_MSG_RESULT(no)
++	else
++	  ac_cv_found_db=yes
++	  AC_MSG_RESULT(yes)
++	  DB_INC_DIR=$ac_cv_db_where_inc
++	  DB_LIB_DIR=$ac_cv_db_where_lib
++	  DB_INC_FLAGS="-I${DB_INC_DIR}"
++          if test "$enable_db4" = "yes"; then
++	     DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-4"
++          else
++	     DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-3"
++          fi
++          dnl Do not force configure.in to put these in CFLAGS and LIBS unconditionally
++          dnl Allow makefile substitutions....
++          AC_SUBST(DB_INC_FLAGS)
++          AC_SUBST(DB_LIB_FLAGS)
++	  if test "X$RPATH" = "X"; then
++		RPATH=""
++	  fi
++	  case "${host}" in
++	    *-*-linux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${DB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-hpux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,+b${DB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${DB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-irix*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${DB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-solaris2*)
++	      if test "$ac_cv_prog_gcc" = yes; then
++		if test "X$RPATH" = "X"; then
++		  RPATH="-Wl,-R${DB_LIB_DIR}"
++		else 
++		  RPATH="${RPATH}:${DB_LIB_DIR}"
++		fi
++	      else
++	        RPATH="${RPATH} -R${DB_LIB_DIR}"
++	      fi
++	      ;;
++	  esac
++	  AC_SUBST(RPATH)
++	fi
++	])
++m4trace:cmulocal/berkdb.m4:235: -1- AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], [
++	BDB_SAVE_LDFLAGS=$LDFLAGS
++
++	if test -d $with_bdb_lib; then
++	    CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
++	    CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
++	else
++	    BDB_LIBADD=""
++	fi
++
++	saved_LIBS=$LIBS
++        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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>],
++	    [db_create(NULL, NULL, 0);],
++	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
++            dblib="no")
++	    if test "$dblib" = "berkeley"; then break; fi
++          done
++        if test "$dblib" = "no"; then
++	    LIBS="$saved_LIBS -ldb"
++	    AC_TRY_LINK([#include <db.h>],
++	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
++	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
++            dblib="no")
++        fi
++	LIBS=$saved_LIBS
++
++	LDFLAGS=$BDB_SAVE_LDFLAGS
++])
++m4trace:cmulocal/berkdb.m4:247: -1- AC_DEFUN([CYRUS_BERKELEY_DB_OPTS], [
++AC_ARG_WITH(bdb-libdir,
++	[  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR],
++	with_bdb_lib=$withval,
++	[ test "${with_bdb_lib+set}" = set || with_bdb_lib=none])
++AC_ARG_WITH(bdb-incdir,
++	[  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR],
++	with_bdb_inc=$withval,
++	[ test "${with_bdb_inc+set}" = set || with_bdb_inc=none ])
++])
++m4trace:cmulocal/berkdb.m4:269: -1- AC_DEFUN([CYRUS_BERKELEY_DB_CHK], [
++	AC_REQUIRE([CYRUS_BERKELEY_DB_OPTS])
++
++	cmu_save_CPPFLAGS=$CPPFLAGS
++
++	if test -d $with_bdb_inc; then
++	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
++	    BDB_INCADD="-I$with_bdb_inc"
++	else
++	    BDB_INCADD=""
++	fi
++
++	dnl Note that FreeBSD puts it in a wierd place
++        dnl (but they should use with-bdb-incdir)
++        AC_CHECK_HEADER(db.h,
++                        [CYRUS_BERKELEY_DB_CHK_LIB()],
++                        dblib="no")
++
++	CPPFLAGS=$cmu_save_CPPFLAGS
++])
++m4trace:cmulocal/bsd_sockets.m4:39: -1- AC_DEFUN([CMU_SOCKETS], [
++	save_LIBS="$LIBS"
++	LIB_SOCKET=""
++	AC_CHECK_FUNC(connect, :,
++		AC_CHECK_LIB(nsl, gethostbyname,
++			     LIB_SOCKET="-lnsl $LIB_SOCKET")
++		AC_CHECK_LIB(socket, connect,
++			     LIB_SOCKET="-lsocket $LIB_SOCKET")
++	)
++	LIBS="$LIB_SOCKET $save_LIBS"
++	AC_CHECK_FUNC(res_search, :,
++		LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++		AC_TRY_LINK([[
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#endif
++#include <resolv.h>]],[[
++const char host[12]="openafs.org";
++u_char ans[1024];
++res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
++return 0;
++]], LIB_SOCKET="-lresolv $LIB_SOCKET")
++        )
++	LIBS="$LIB_SOCKET $save_LIBS"
++	AC_CHECK_FUNCS(dn_expand dns_lookup)
++	LIBS="$save_LIBS"
++	AC_SUBST(LIB_SOCKET)
++	])
++m4trace:cmulocal/c-attribute.m4:30: -1- AC_DEFUN([CMU_C___ATTRIBUTE__], [
++AC_MSG_CHECKING(for __attribute__)
++AC_CACHE_VAL(ac_cv___attribute__, [
++AC_TRY_COMPILE([
++#include <stdlib.h>
++],
++[
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++],
++ac_cv___attribute__=yes,
++ac_cv___attribute__=no)])
++if test "$ac_cv___attribute__" = "yes"; then
++  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
++fi
++AC_MSG_RESULT($ac_cv___attribute__)
++])
++m4trace:cmulocal/c-fpic.m4:34: -1- AC_DEFUN([CMU_C_FPIC], [
++AC_MSG_CHECKING(if compiler supports -fPIC)
++AC_CACHE_VAL(ac_cv_fpic, [
++save_CFLAGS=$CFLAGS
++CFLAGS="${CFLAGS} -fPIC"
++AC_TRY_COMPILE([
++#include <stdlib.h>
++],
++[
++static void
++foo(void)
++{
++  exit(1);
++}
++],
++ac_cv_fpic=yes,
++ac_cv_fpic=no)
++CFLAGS=$save_CFLAGS
++])
++if test "$ac_cv_fpic" = "yes"; then
++    FPIC_CFLAGS="-fPIC"
++else
++    FPIC_CFLAGS=""
++fi
++AC_MSG_RESULT($ac_cv_fpic)
++])
++m4trace:cmulocal/common.m4:12: -1- AC_DEFUN([CMU_TEST_LIBPATH], [
++changequote(<<, >>)
++define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_lib, <<- *>>, <<__p>>))
++changequote([, ])
++if test "$CMU_AC_CV_FOUND" = "yes"; then
++  if test \! -r "$1/lib$2.a" -a \! -r "$1/lib$2.so" -a \! -r "$1/lib$2.sl" -a \! -r "$1/lib$2.dylib"; then
++    CMU_AC_CV_FOUND=no
++  fi
++fi
++])
++m4trace:cmulocal/common.m4:23: -1- AC_DEFUN([CMU_TEST_INCPATH], [
++changequote(<<, >>)
++define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_inc, [ *], [_p]))
++changequote([, ])
++if test "$CMU_AC_CV_FOUND" = "yes"; then
++  if test \! -r "$1/$2.h"; then
++    CMU_AC_CV_FOUND=no
++  fi
++fi
++])
++m4trace:cmulocal/common.m4:40: -1- AC_DEFUN([CMU_CHECK_HEADER_NOCACHE], [dnl Do the transliteration at runtime so arg 1 can be a shell variable.
++ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
++AC_MSG_CHECKING([for $1])
++AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes",
++  eval "ac_cv_header_$ac_safe=no")
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  AC_MSG_RESULT(yes)
++  ifelse([$2], , :, [$2])
++else
++  AC_MSG_RESULT(no)
++ifelse([$3], , , [$3
++])dnl
++fi
++])
++m4trace:cmulocal/common.m4:61: -1- AC_DEFUN([CMU_FIND_LIB_SUBDIR], [dnl
++AC_ARG_WITH([lib-subdir], AC_HELP_STRING([--with-lib-subdir=DIR],[Find libraries in DIR instead of lib]))
++AC_CHECK_SIZEOF(long)
++AC_CACHE_CHECK([what directory libraries are found in], [ac_cv_cmu_lib_subdir],
++[test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
++test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
++if test "X$with_lib_subdir" = "X" ; then
++  ac_cv_cmu_lib_subdir=lib
++  if test $ac_cv_sizeof_long -eq 4 ; then
++    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
++  fi
++  if test $ac_cv_sizeof_long -eq 8 ; then
++    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
++  fi
++else
++  ac_cv_cmu_lib_subdir=$with_lib_subdir
++fi])
++AC_SUBST(CMU_LIB_SUBDIR, $ac_cv_cmu_lib_subdir)
++])
++m4trace:cmulocal/cyrus.m4:20: -1- AC_DEFUN([CMU_ADD_LIBPATH], [
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$1 ${LDFLAGS}"
++  else
++	LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
++  fi
++])
++m4trace:cmulocal/cyrus.m4:31: -1- AC_DEFUN([CMU_ADD_LIBPATH_TO], [
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	$2="-L$1 ${$2}"
++  else
++	$2="-L$1 ${$2} $andrew_runpath_switch$1"
++  fi
++])
++m4trace:cmulocal/cyrus.m4:38: -1- AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
++   # CMU GUESS RUNPATH SWITCH
++    andrew_runpath_switch="none"
++])
++m4trace:cmulocal/ipv6.m4:62: -1- AC_DEFUN([IPv6_CHECK_FUNC], [
++AC_CHECK_FUNC($1, [dnl
++  ac_cv_lib_socket_$1=no
++  ac_cv_lib_inet6_$1=no
++], [dnl
++  AC_CHECK_LIB(socket, $1, [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_$1=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_$1=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, $1, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])dnl
++])dnl
++ipv6_cv_$1=no
++if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \
++     -o $ac_cv_lib_inet6_$1 = yes
++then
++  ipv6_cv_$1=yes
++fi
++if test $ipv6_cv_$1 = no; then
++  if test $1 = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      AC_EGREP_HEADER(${ipv6_cv_pfx}$1, netdb.h,
++		      [AC_CHECK_FUNC(${ipv6_cv_pfx}$1)])
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}$1 = Xyes; then
++        AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?])
++        ipv6_cv_$1=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_$1 = yes; then
++  ifelse([$2], , :, [$2])
++else
++  ifelse([$3], , :, [$3])
++fi])
++m4trace:cmulocal/ipv6.m4:78: -1- AC_DEFUN([IPv6_CHECK_SS_FAMILY], [
++AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage])
++AC_CACHE_VAL(ipv6_cv_ss_family, [dnl
++AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/socket.h>],
++	[struct sockaddr_storage ss; int i = ss.ss_family;],
++	[ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl
++if test $ipv6_cv_ss_family = yes; then
++  ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY,[],[Is there an ss_family in sockaddr_storage?]), [$1])
++else
++  ifelse([$2], , :, [$2])
++fi
++AC_MSG_RESULT($ipv6_cv_ss_family)])
++m4trace:cmulocal/ipv6.m4:94: -1- AC_DEFUN([IPv6_CHECK_SA_LEN], [
++AC_MSG_CHECKING([whether you have sa_len in struct sockaddr])
++AC_CACHE_VAL(ipv6_cv_sa_len, [dnl
++AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/socket.h>],
++	       [struct sockaddr sa; int i = sa.sa_len;],
++	       [ipv6_cv_sa_len=yes], [ipv6_cv_sa_len=no])])dnl
++if test $ipv6_cv_sa_len = yes; then
++  ifelse([$1], , AC_DEFINE(HAVE_SOCKADDR_SA_LEN,[],[Does sockaddr have an sa_len?]), [$1])
++else
++  ifelse([$2], , :, [$2])
++fi
++AC_MSG_RESULT($ipv6_cv_sa_len)])
++m4trace:cmulocal/ipv6.m4:110: -1- AC_DEFUN([IPv6_CHECK_SOCKLEN_T], [
++AC_MSG_CHECKING(for socklen_t)
++AC_CACHE_VAL(ipv6_cv_socklen_t, [dnl
++AC_TRY_LINK([#include <sys/types.h>
++#include <sys/socket.h>],
++	    [socklen_t len = 0;],
++	    [ipv6_cv_socklen_t=yes], [ipv6_cv_socklen_t=no])])dnl
++if test $ipv6_cv_socklen_t = yes; then
++  ifelse([$1], , AC_DEFINE(HAVE_SOCKLEN_T,[],[Do we have a socklen_t?]), [$1])
++else
++  ifelse([$2], , :, [$2])
++fi
++AC_MSG_RESULT($ipv6_cv_socklen_t)])
++m4trace:cmulocal/kerberos_v4.m4:23: -1- AC_DEFUN([CMU_KRB_SENDAUTH_PROTO], [
++AC_MSG_CHECKING(for krb_sendauth prototype)
++AC_TRY_COMPILE(
++[#include <krb.h>
++int krb_sendauth (long options, int fd, KTEXT ktext, char *service,
++                  char *inst, char *realm, u_long checksum,
++                  MSG_DAT *msg_data, CREDENTIALS *cred,
++                  Key_schedule schedule, struct sockaddr_in *laddr,
++                  struct sockaddr_in *faddr, char *version);],
++[int foo = krb_sendauth(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ],
++ac_cv_krb_sendauth_proto=no,
++ac_cv_krb_sendauth_proto=yes)
++AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
++if test "$ac_cv_krb_sendauth_proto" = yes; then
++        AC_DEFINE(HAVE_KRB_SENDAUTH_PROTO)dnl
++fi
++AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
++])
++m4trace:cmulocal/kerberos_v4.m4:42: -1- AC_DEFUN([CMU_KRB_SET_KEY_PROTO], [
++AC_MSG_CHECKING(for krb_set_key prototype)
++AC_CACHE_VAL(ac_cv_krb_set_key_proto, [
++cmu_save_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
++AC_TRY_COMPILE(
++[#include <krb.h>
++int krb_set_key(char *key, int cvt);],
++[int foo = krb_set_key(0, 0);],
++ac_cv_krb_set_key_proto=no,
++ac_cv_krb_set_key_proto=yes)
++])
++CPPFLAGS="${cmu_save_CPPFLAGS}"
++if test "$ac_cv_krb_set_key_proto" = yes; then
++	AC_DEFINE(HAVE_KRB_SET_KEY_PROTO)dnl
++fi
++AC_MSG_RESULT($ac_cv_krb_set_key_proto)
++])
++m4trace:cmulocal/kerberos_v4.m4:61: -1- AC_DEFUN([CMU_KRB4_32_DEFN], [
++AC_MSG_CHECKING(for KRB4_32 definition)
++AC_CACHE_VAL(ac_cv_krb4_32_defn, [
++cmu_save_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
++AC_TRY_COMPILE(
++[#include <krb.h>
++],
++[KRB4_32 foo = 1;],
++ac_cv_krb4_32_defn=yes,
++ac_cv_krb4_32_defn=no)
++])
++CPPFLAGS="${cmu_save_CPPFLAGS}"
++if test "$ac_cv_krb4_32_defn" = yes; then
++	AC_DEFINE(HAVE_KRB4_32_DEFINE)dnl
++fi
++AC_MSG_RESULT($ac_cv_krb4_32_defn)
++])
++m4trace:cmulocal/kerberos_v4.m4:81: -1- AC_DEFUN([CMU_KRB_RD_REQ_PROTO], [
++AC_MSG_CHECKING(for krb_rd_req prototype)
++AC_CACHE_VAL(ac_cv_krb_rd_req_proto, [
++cmu_save_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
++AC_TRY_COMPILE(
++[#include <krb.h>
++int krb_rd_req(KTEXT authent, char *service, char *instance,
++unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn);],
++[int foo = krb_rd_req(0,0,0,0,0,0);],
++ac_cv_krb_rd_req_proto=no,
++ac_cv_krb_rd_req_proto=yes)
++])
++CPPFLAGS="${cmu_save_CPPFLAGS}"
++if test "$ac_cv_krb_rd_req_proto" = yes; then
++	AC_DEFINE(HAVE_KRB_RD_REQ_PROTO)dnl
++fi
++AC_MSG_RESULT($ac_cv_krb_rd_req_proto)
++])
++m4trace:cmulocal/kerberos_v4.m4:98: -1- AC_DEFUN([CMU_KRB_INC_WHERE1], [
++saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$saved_CPPFLAGS -I$1"
++AC_TRY_COMPILE([#include <krb.h>],
++[struct ktext foo;],
++ac_cv_found_krb_inc=yes,
++ac_cv_found_krb_inc=no)
++if test "$ac_cv_found_krb_inc" = "no"; then
++  CPPFLAGS="$saved_CPPFLAGS -I$1 -I$1/kerberosIV"
++  AC_TRY_COMPILE([#include <krb.h>],
++  [struct ktext foo;],
++  [ac_cv_found_krb_inc=yes],
++  ac_cv_found_krb_inc=no)
++fi
++CPPFLAGS=$saved_CPPFLAGS
++])
++m4trace:cmulocal/kerberos_v4.m4:113: -1- AC_DEFUN([CMU_KRB_INC_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for kerberos headers in $i)
++      CMU_KRB_INC_WHERE1($i)
++      CMU_TEST_INCPATH($i, krb)
++      if test "$ac_cv_found_krb_inc" = "yes"; then
++        ac_cv_krb_where_inc=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/kerberos_v4.m4:127: -1- AC_DEFUN([CMU_KRB_LIB_WHERE1], [
++saved_LIBS=$LIBS
++LIBS="$saved_LIBS -L$1 -lkrb ${KRB_LIBDES}"
++AC_TRY_LINK(,
++[dest_tkt();],
++[ac_cv_found_krb_lib=yes],
++ac_cv_found_krb_lib=no)
++LIBS=$saved_LIBS
++])
++m4trace:cmulocal/kerberos_v4.m4:143: -1- AC_DEFUN([CMU_KRB_LIB_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for kerberos libraries in $i)
++      CMU_KRB_LIB_WHERE1($i)
++      dnl deal with false positives from implicit link paths
++      CMU_TEST_LIBPATH($i, krb)
++      if test "$ac_cv_found_krb_lib" = "yes" ; then
++        ac_cv_krb_where_lib=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/kerberos_v4.m4:284: -1- AC_DEFUN([CMU_KRB4], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++AC_REQUIRE([CMU_SOCKETS])
++AC_REQUIRE([CMU_LIBSSL])
++AC_ARG_WITH(krb4,
++	[  --with-krb4=PREFIX      Compile with Kerberos 4 support],
++	[if test "X$with_krb4" = "X"; then
++		with_krb4=yes
++	fi])
++AC_ARG_WITH(krb4-lib,
++	[  --with-krb4-lib=dir     use kerberos 4 libraries in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-krb4-lib])
++	fi])
++AC_ARG_WITH(krb4-include,
++	[  --with-krb4-include=dir use kerberos 4 headers in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-krb4-include])
++	fi])
++
++	if test "X$with_krb4" != "X"; then
++	  if test "$with_krb4" != "yes" -a "$with_krb4" != "no"; then
++	    ac_cv_krb_where_lib=$with_krb4/$CMU_LIB_SUBDIR
++	    ac_cv_krb_where_inc=$with_krb4/include
++	  fi
++	fi
++       
++	if test "$with_krb4" != "no"; then
++	  if test "X$with_krb4_lib" != "X"; then
++	    ac_cv_krb_where_lib=$with_krb4_lib
++	  fi
++	  if test "X$with_krb4_include" != "X"; then
++	    ac_cv_krb_where_inc=$with_krb4_include
++	  fi
++	  if test "X$ac_cv_krb_where_inc" = "X"; then
++	    CMU_KRB_INC_WHERE(/usr/athena/include /usr/include/kerberosIV /usr/local/include /usr/include/kerberos)
++	  fi
++
++          AC_MSG_CHECKING([if libdes is needed])
++          AC_TRY_LINK([],[des_quad_cksum();],KRB_DES_LIB="",KRB_DES_LIB="maybe")
++          if test "X$KRB_DES_LIB" != "X"; then
++              LIBS="$cmu_save_LIBS -ldes"
++              AC_TRY_LINK([], [des_quad_cksum();],KRB_DES_LIB="yes")
++              if test "X$KRB_DES_LIB" = "Xyes"; then
++                  AC_MSG_RESULT([yes])
++                  KRB_LIBDES="-ldes"
++                  KRB_LIBDESA='$(KRB_LIB_DIR)/libdes.a'
++              else
++                  LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
++                  AC_TRY_LINK([],
++                  [des_quad_cksum();],KRB_DES_LIB="libcrypto")
++                  if test "X$KRB_DES_LIB" = "Xlibcrypto"; then
++                      AC_MSG_RESULT([libcrypto])
++                      KRB_LIBDES="$LIBSSL_LIB_FLAGS"
++                      KRB_LIBDESA="$LIBSSL_LIB_FLAGS"
++                  else
++                      LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++                      AC_TRY_LINK([],
++                      [des_quad_cksum();],KRB_DES_LIB="libcrypto+descompat")
++                      if test "X$KRB_DES_LIB" = "Xlibcrypto+descompat"; then
++                          AC_MSG_RESULT([libcrypto+descompat])
++                          KRB_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++                          KRB_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
++                      else
++                          AC_MSG_RESULT([unknown])
++                          AC_MSG_ERROR([Could not use -ldes])
++                      fi 
++                  fi 
++              fi 
++          else
++             AC_MSG_RESULT([no])
++          fi
++          if test "X$ac_cv_krb_where_lib" = "X"; then
++            CMU_KRB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
++          fi
++	fi
++	  LIBS="${cmu_save_LIBS}"
++
++
++	AC_MSG_CHECKING([whether to include kerberos 4])
++	if test "X$ac_cv_krb_where_lib" = "X" -o "X$ac_cv_krb_where_inc" = "X"; then
++	  ac_cv_found_krb=no
++	  AC_MSG_RESULT(no)
++	else
++	  ac_cv_found_krb=yes
++	  AC_MSG_RESULT(yes)
++	  KRB_INC_DIR=$ac_cv_krb_where_inc
++	  KRB_LIB_DIR=$ac_cv_krb_where_lib
++	  KRB_INC_FLAGS="-I${KRB_INC_DIR}"
++	  KRB_LIB_FLAGS="-L${KRB_LIB_DIR} -lkrb ${KRB_LIBDES}"
++	  LIBS="${cmu_save_LIBS} ${KRB_LIB_FLAGS}"
++	  AC_CHECK_LIB(resolv, dns_lookup, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lresolv",,"${KRB_LIB_FLAGS}")
++	  AC_CHECK_LIB(crypt, crypt, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lcrypt",,"${KRB_LIB_FLAGS}")
++	  LIBS="${LIBS} ${KRB_LIB_FLAGS}"
++	  AC_CHECK_FUNCS(krb_get_int krb_life_to_time)
++          AC_SUBST(KRB_INC_FLAGS)
++          AC_SUBST(KRB_LIB_FLAGS)
++	  LIBS="${cmu_save_LIBS}"
++	  AC_DEFINE(HAVE_KRB4,,[Kerberos V4 is present])dnl zephyr uses this
++	  AC_DEFINE(KERBEROS,,[Use kerberos 4. find out what needs this symbol])
++	  if test "X$RPATH" = "X"; then
++		RPATH=""
++	  fi
++	  case "${host}" in
++	    *-*-linux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${KRB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-hpux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,+b${KRB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${KRB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-irix*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${KRB_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-solaris2*)
++	      if test "$ac_cv_prog_gcc" = yes; then
++		if test "X$RPATH" = "X"; then
++		  RPATH="-Wl,-R${KRB_LIB_DIR}"
++		else 
++		  RPATH="${RPATH}:${KRB_LIB_DIR}"
++		fi
++	      else
++	        RPATH="${RPATH} -R${KRB_LIB_DIR}"
++	      fi
++	      ;;
++	  esac
++	  AC_SUBST(RPATH)
++	fi
++	])
++m4trace:cmulocal/libssl.m4:13: -1- AC_DEFUN([CMU_LIBSSL_INC_WHERE1], [
++saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$saved_CPPFLAGS -I$1"
++CMU_CHECK_HEADER_NOCACHE(openssl/ssl.h,
++ac_cv_found_libssl_inc=yes,
++ac_cv_found_libssl_inc=no)
++CPPFLAGS=$saved_CPPFLAGS
++])
++m4trace:cmulocal/libssl.m4:28: -1- AC_DEFUN([CMU_LIBSSL_INC_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for libssl headers in $i)
++      CMU_LIBSSL_INC_WHERE1($i)
++      CMU_TEST_INCPATH($i, ssl)
++      if test "$ac_cv_found_libssl_inc" = "yes"; then
++        ac_cv_libssl_where_inc=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/libssl.m4:38: -1- AC_DEFUN([CMU_LIBSSL_LIB_WHERE1], [
++saved_LIBS=$LIBS
++LIBS="$saved_LIBS -L$1 -lssl -lcrypto $LIB_SOCKET"
++AC_TRY_LINK(,
++[SSL_write();],
++[ac_cv_found_ssl_lib=yes],
++ac_cv_found_ssl_lib=no)
++LIBS=$saved_LIBS
++])
++m4trace:cmulocal/libssl.m4:54: -1- AC_DEFUN([CMU_LIBSSL_LIB_WHERE], [
++   for i in $1; do
++      AC_MSG_CHECKING(for libssl libraries in $i)
++      CMU_LIBSSL_LIB_WHERE1($i)
++      dnl deal with false positives from implicit link paths
++      CMU_TEST_LIBPATH($i, ssl)
++      if test "$ac_cv_found_ssl_lib" = "yes" ; then
++        ac_cv_libssl_where_lib=$i
++        AC_MSG_RESULT(found)
++        break
++      else
++        AC_MSG_RESULT(not found)
++      fi
++    done
++])
++m4trace:cmulocal/libssl.m4:152: -1- AC_DEFUN([CMU_LIBSSL], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++AC_REQUIRE([CMU_SOCKETS])
++AC_ARG_WITH(libssl,
++	[  --with-libssl=PREFIX      Compile with Libssl support],
++	[if test "X$with_libssl" = "X"; then
++		with_libssl=yes
++	fi])
++AC_ARG_WITH(libssl-lib,
++	[  --with-libssl-lib=dir     use libssl libraries in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-libssl-lib])
++	fi])
++AC_ARG_WITH(libssl-include,
++	[  --with-libssl-include=dir use libssl headers in dir],
++	[if test "$withval" = "yes" -o "$withval" = "no"; then
++		AC_MSG_ERROR([No argument for --with-libssl-include])
++	fi])
++
++	if test "X$with_libssl" != "X"; then
++	  if test "$with_libssl" != "yes" -a "$with_libssl" != no; then
++	    ac_cv_libssl_where_lib=$with_libssl/$CMU_LIB_SUBDIR
++	    ac_cv_libssl_where_inc=$with_libssl/include
++	  fi
++	fi
++
++	if test "$with_libssl" != "no"; then 
++	  if test "X$with_libssl_lib" != "X"; then
++	    ac_cv_libssl_where_lib=$with_libssl_lib
++	  fi
++	  if test "X$ac_cv_libssl_where_lib" = "X"; then
++	    CMU_LIBSSL_LIB_WHERE(/usr/local/$CMU_LIB_SUBDIR/openssl /usr/$CMU_LIB_SUBDIR/openssl /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
++	  fi
++
++	  if test "X$with_libssl_include" != "X"; then
++	    ac_cv_libssl_where_inc=$with_libssl_include
++	  fi
++	  if test "X$ac_cv_libssl_where_inc" = "X"; then
++	    CMU_LIBSSL_INC_WHERE(/usr/local/include /usr/include)
++	  fi
++	fi
++
++	AC_MSG_CHECKING(whether to include libssl)
++	if test "X$ac_cv_libssl_where_lib" = "X" -a "X$ac_cv_libssl_where_inc" = "X"; then
++	  ac_cv_found_libssl=no
++	  AC_MSG_RESULT(no)
++	else
++	  ac_cv_found_libssl=yes
++	  AC_MSG_RESULT(yes)
++	  LIBSSL_INC_DIR=$ac_cv_libssl_where_inc
++	  LIBSSL_LIB_DIR=$ac_cv_libssl_where_lib
++	  LIBSSL_INC_FLAGS="-I${LIBSSL_INC_DIR}"
++	  LIBSSL_LIB_FLAGS="-L${LIBSSL_LIB_DIR} -lssl -lcrypto"
++	  if test "X$RPATH" = "X"; then
++		RPATH=""
++	  fi
++	  case "${host}" in
++	    *-*-linux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
++	      else 
++ 		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-hpux*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,+b${LIBSSL_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-irix*)
++	      if test "X$RPATH" = "X"; then
++	        RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
++	      else 
++		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
++	      fi
++	      ;;
++	    *-*-solaris2*)
++	      if test "$ac_cv_prog_gcc" = yes; then
++		if test "X$RPATH" = "X"; then
++		  RPATH="-Wl,-R${LIBSSL_LIB_DIR}"
++		else 
++		  RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
++		fi
++	      else
++	        RPATH="${RPATH} -R${LIBSSL_LIB_DIR}"
++	      fi
++	      ;;
++	  esac
++	  AC_SUBST(RPATH)
++	fi
++	AC_SUBST(LIBSSL_INC_DIR)
++	AC_SUBST(LIBSSL_LIB_DIR)
++	AC_SUBST(LIBSSL_INC_FLAGS)
++	AC_SUBST(LIBSSL_LIB_FLAGS)
++	])
++m4trace:cmulocal/libwrap.m4:30: -1- AC_DEFUN([CMU_LIBWRAP], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++  AC_REQUIRE([CMU_SOCKETS])
++  AC_ARG_WITH(libwrap, 
++              [  --with-libwrap=DIR      use libwrap (rooted in DIR) [yes] ],
++              with_libwrap=$withval, with_libwrap=yes)
++  if test "$with_libwrap" != no; then
++    if test -d "$with_libwrap"; then
++      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
++      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
++    fi
++    cmu_save_LIBS="$LIBS"
++    AC_CHECK_LIB(wrap, request_init, [
++		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)],
++		 with_libwrap=no, ${LIB_SOCKET})
++    LIBS="$cmu_save_LIBS"
++  fi
++  AC_MSG_CHECKING(libwrap support)
++  AC_MSG_RESULT($with_libwrap)
++  LIB_WRAP=""
++  if test "$with_libwrap" != no; then
++    AC_DEFINE(HAVE_LIBWRAP,[],[Do we have TCP wrappers?])
++    LIB_WRAP="-lwrap"
++    AC_CHECK_LIB(nsl, yp_get_default_domain, LIB_WRAP="${LIB_WRAP} -lnsl")
++  fi
++  AC_SUBST(LIB_WRAP)
++])
++m4trace:cmulocal/sasl2.m4:264: -1- AC_DEFUN([SASL_GSSAPI_CHK], [AC_REQUIRE([SASL2_CRYPT_CHK])
++AC_REQUIRE([CMU_SOCKETS])
++AC_ARG_ENABLE([gssapi],
++              [AC_HELP_STRING([--enable-gssapi=<DIR>],
++                              [enable GSSAPI authentication [yes]])],
++              [gssapi=$enableval],
++              [gssapi=yes])
++AC_ARG_WITH([gss_impl],
++            [AC_HELP_STRING([--with-gss_impl={heimdal|mit|cybersafe|seam|auto}],
++                            [choose specific GSSAPI implementation [[auto]]])],
++            [gss_impl=$withval],
++            [gss_impl=auto])
++
++if test "$gssapi" != no; then
++  platform=
++  case "${host}" in
++    *-*-linux*)
++      platform=__linux
++      ;;
++    *-*-hpux*)
++      platform=__hpux
++      ;;
++    *-*-irix*)
++      platform=__irix
++      ;;
++    *-*-solaris2*)
++# When should we use __sunos?
++      platform=__solaris
++      ;;
++    *-*-aix*)
++###_AIX
++      platform=__aix
++      ;;
++    *)
++      AC_WARN([The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script])
++      if test "$gss_impl" = "cybersafe"; then
++        AC_ERROR([CyberSafe was forced, cannot continue as platform is not supported])
++      fi
++      ;;
++  esac
++
++  cmu_saved_CPPFLAGS=$CPPFLAGS
++
++  if test -d ${gssapi}; then
++    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++# We want to keep -I in our CPPFLAGS, but only if we succeed
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++### I am not sure how useful is this (and whether this is required at all
++### especially when we have to provide two -L flags for new CyberSafe
++    LDFLAGS="$LDFLAGS -L$gssapi/lib"
++
++    if test -n "$platform"; then
++      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++        CPPFLAGS="$CPPFLAGS -D$platform"
++        if test -d "${gssapi}/appsec-sdk/include"; then
++          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++        fi
++      fi
++    fi
++  fi
++  AC_CHECK_HEADER([gssapi.h],
++                  [AC_DEFINE(HAVE_GSSAPI_H,,
++                             [Define if you have the gssapi.h header file])],
++                  [AC_CHECK_HEADER([gssapi/gssapi.h],,
++                                   [AC_WARN([Disabling GSSAPI - no include files found]); gssapi=no])])
++
++  CPPFLAGS=$cmu_saved_CPPFLAGS
++
++fi
++
++if test "$gssapi" != no; then
++  # We need to find out which gssapi implementation we are
++  # using. Supported alternatives are: MIT Kerberos 5,
++  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
++  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
++  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
++  #
++  # The choice is reflected in GSSAPIBASE_LIBS
++
++  AC_CHECK_LIB(resolv,res_search)
++  if test -d ${gssapi}; then
++     gssapi_dir="${gssapi}/lib"
++     GSSAPIBASE_LIBS="-L$gssapi_dir"
++     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
++  else
++     # FIXME: This is only used for building cyrus, and then only as
++     # a real hack.  it needs to be fixed.
++     gssapi_dir="/usr/local/lib"
++  fi
++
++  # Check a full link against the Heimdal libraries.
++  # If this fails, check a full link against the MIT libraries.
++  # If this fails, check a full link against the CyberSafe libraries.
++  # If this fails, check a full link against the Solaris 8 and up libgss.
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
++    gss_failed=0
++    AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
++                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
++    gss_failed=0
++    AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
++                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  # For Cybersafe one has to set a platform define in order to make compilation work
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
++
++    cmu_saved_CPPFLAGS=$CPPFLAGS
++    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
++# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
++    if test -d "${gssapi}/appsec-rt/lib"; then
++      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
++    fi
++    CPPFLAGS="$CPPFLAGS -D$platform"
++    if test -d "${gssapi}/appsec-sdk/include"; then
++      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
++    fi
++
++    gss_failed=0
++
++# Check for CyberSafe with two libraries first, than fall back to a single 
++# library (older CyberSafe)
++
++    unset ac_cv_lib_gss_csf_gss_acq_user
++    AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe03",
++                 [unset ac_cv_lib_gss_csf_gss_acq_user;
++                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
++                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)],
++                 [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
++
++    if test "$gss_failed" = "1"; then
++# Restore variables
++      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
++      CPPFLAGS=$cmu_saved_CPPFLAGS
++
++      if test "$gss_impl" != "auto"; then
++        gss_impl="failed"
++      fi
++    fi
++  fi
++
++  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
++    gss_failed=0
++    AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",gss_failed=1,-lgss)
++    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
++      gss_impl="failed"
++    fi
++  fi
++
++  if test "$gss_impl" = "mit"; then
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++  elif test "$gss_impl" = "heimdal"; then
++    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++  elif test "$gss_impl" = "cybersafe03"; then
++# Version of CyberSafe with two libraries
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "cybersafe"; then
++    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
++    # there is no static libgss for CyberSafe
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "seam"; then
++    GSSAPIBASE_LIBS=-lgss
++    # there is no static libgss on Solaris 8 and up
++    GSSAPIBASE_STATIC_LIBS=none
++  elif test "$gss_impl" = "failed"; then
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    AC_WARN([Disabling GSSAPI - specified library not found])
++  else
++    gssapi="no"
++    GSSAPIBASE_LIBS=
++    GSSAPIBASE_STATIC_LIBS=
++    AC_WARN([Disabling GSSAPI - no library])
++  fi
++fi
++
++#
++# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
++# in gssapi\rfckrb5.h
++#
++if test "$gssapi" != "no"; then
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes,
++                 [#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
++                    hostbased_service_gss_nt_yes
++                  #endif],
++                 [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++                            [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])],
++                 [AC_WARN([Cybersafe define not found])])
++
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
++                    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++                               [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
++                    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++                               [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
++  fi
++
++  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
++    AC_EGREP_CPP(user_name_yes_gss_nt,
++                 [#include <gssapi/gssapi.h>
++                  #ifdef GSS_C_NT_USER_NAME
++                   user_name_yes_gss_nt
++                  #endif],
++                 [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
++                            [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])],
++                 [AC_WARN([Cybersafe define not found])])
++  elif test "$ac_cv_header_gssapi_h" = "yes"; then
++    AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
++                    [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
++                               [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])])
++  elif test "$ac_cv_header_gssapi_gssapi_h"; then
++    AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
++                    [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
++                               [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])])
++  fi
++fi
++
++GSSAPI_LIBS=""
++AC_MSG_CHECKING([GSSAPI])
++if test "$gssapi" != no; then
++  AC_MSG_RESULT([with implementation ${gss_impl}])
++  AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
++  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
++  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
++
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
++  LIBS="$cmu_save_LIBS"
++else
++  AC_MSG_RESULT([disabled])
++fi
++AC_SUBST(GSSAPI_LIBS)
++AC_SUBST(GSSAPIBASE_LIBS)
++])
++m4trace:cmulocal/sasl2.m4:271: -1- AC_DEFUN([SASL_SET_GSSAPI_LIBS], [SASL_GSSAPI_LIBS_SET="yes"
++])
++m4trace:cmulocal/sasl2.m4:400: -1- AC_DEFUN([CMU_SASL2], [AC_REQUIRE([SASL_GSSAPI_CHK])
++
++AC_ARG_WITH(sasl,
++            [AC_HELP_STRING([--with-sasl=DIR],[Compile with libsasl2 in <DIR>])],
++            with_sasl="$withval",
++            with_sasl="yes")
++
++AC_ARG_WITH(staticsasl,
++            [AC_HELP_STRING([--with-staticsasl=DIR],
++                            [Compile with staticly linked libsasl2 in <DIR>])],
++            [with_staticsasl="$withval";
++             if test $with_staticsasl != "no"; then
++               using_static_sasl="static"
++             fi],
++            [with_staticsasl="no"; using_static_sasl="no"])
++
++SASLFLAGS=""
++LIB_SASL=""
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++cmu_saved_LDFLAGS=$LDFLAGS
++cmu_saved_LIBS=$LIBS
++
++if test ${with_staticsasl} != "no"; then
++  if test -d ${with_staticsasl}; then
++    if test -d ${with_staticsasl}/lib64 ; then
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
++    else
++      ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    fi
++    ac_cv_sasl_where_lib=${with_staticsasl}/lib
++    ac_cv_sasl_where_inc=${with_staticsasl}/include
++
++    SASLFLAGS="-I$ac_cv_sasl_where_inc"
++    LIB_SASL="-L$ac_cv_sasl_where_lib"
++    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++  else
++    with_staticsasl="/usr"
++  fi
++
++  AC_CHECK_HEADER(sasl/sasl.h,
++                  [AC_CHECK_HEADER(sasl/saslutil.h,
++                                   [for i42 in lib64 lib; do
++                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
++                                        ac_cv_found_sasl=yes
++                                        AC_MSG_CHECKING([for static libsasl])
++                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
++                                      fi
++                                    done
++                                    if test ! "$ac_cv_found_sasl" = "yes"; then
++                                      AC_MSG_CHECKING([for static libsasl])
++                                      AC_ERROR([Could not find ${with_staticsasl}/lib*/libsasl2.a])
++                                    fi])])
++
++  AC_MSG_RESULT([found])
++
++  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
++    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
++  else
++    SASL_GSSAPI_LIBS_SET=""
++    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
++  fi
++fi
++
++if test -d ${with_sasl}; then
++  ac_cv_sasl_where_lib=${with_sasl}/lib
++  ac_cv_sasl_where_inc=${with_sasl}/include
++
++  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
++  fi
++  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
++  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
++  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
++fi
++
++# be sure to check for a SASLv2 specific function
++AC_CHECK_HEADER(sasl/sasl.h,
++                [AC_CHECK_HEADER(sasl/saslutil.h,
++                                 [AC_CHECK_LIB(sasl2, prop_get, 
++                                               ac_cv_found_sasl=yes,
++                                               ac_cv_found_sasl=no)],
++                                 ac_cv_found_sasl=no)],
++                ac_cv_found_sasl=no)
++
++if test "$ac_cv_found_sasl" = "yes"; then
++  if test "$ac_cv_sasl_where_lib" != ""; then
++    CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
++  fi
++  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
++  if test "$using_static_sasl" != "static"; then
++    LIB_SASL=$DYNLIB_SASL
++    SASLFLAGS=$DYNSASLFLAGS
++  fi
++else
++  DYNLIB_SASL=""
++  DYNSASLFLAGS=""
++  using_static_sasl="staticonly"
++fi
++
++if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
++  SASL_GSSAPI_LIBS_SET=""
++  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
++fi
++
++LIBS="$cmu_saved_LIBS"
++LDFLAGS="$cmu_saved_LDFLAGS"
++CPPFLAGS="$cmu_saved_CPPFLAGS"
++
++AC_SUBST(LIB_DYN_SASL)
++AC_SUBST(DYNSASLFLAGS)
++AC_SUBST(LIB_SASL)
++AC_SUBST(SASLFLAGS)
++])
++m4trace:cmulocal/sasl2.m4:410: -1- AC_DEFUN([CMU_SASL2_REQUIRED], [AC_REQUIRE([CMU_SASL2])
++if test "$ac_cv_found_sasl" != "yes"; then
++  AC_ERROR([Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.])
++fi])
++m4trace:cmulocal/sasl2.m4:441: -1- AC_DEFUN([CMU_SASL2_REQUIRE_VER], [AC_REQUIRE([CMU_SASL2_REQUIRED])
++
++cmu_saved_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS $SASLFLAGS"
++
++AC_TRY_CPP([
++#include <sasl/sasl.h>
++
++#ifndef SASL_VERSION_MAJOR
++#error SASL_VERSION_MAJOR not defined
++#endif
++#ifndef SASL_VERSION_MINOR
++#error SASL_VERSION_MINOR not defined
++#endif
++#ifndef SASL_VERSION_STEP
++#error SASL_VERSION_STEP not defined
++#endif
++
++#if SASL_VERSION_MAJOR < $1 || SASL_VERSION_MINOR < $2 || SASL_VERSION_STEP < $3
++#error SASL version is less than $1.$2.$3
++#endif
++],,
++           [AC_ERROR([Incorrect SASL headers found.  This package requires SASL $1.$2.$3 or newer.])])
++
++CPPFLAGS=$cmu_saved_CPPFLAGS
++])
++m4trace:cmulocal/sasl2.m4:458: -1- AC_DEFUN([CMU_SASL2_CHECKAPOP_REQUIRED], [AC_REQUIRE([CMU_SASL2_REQUIRED])
++
++cmu_saved_LDFLAGS=$LDFLAGS
++
++LDFLAGS="$LDFLAGS $LIB_SASL"
++
++AC_CHECK_LIB(sasl2, sasl_checkapop,
++             [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])],
++             [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
++
++LDFLAGS=$cmu_saved_LDFLAGS
++])
++m4trace:cmulocal/sasl2.m4:469: -1- AC_DEFUN([SASL2_CRYPT_CHK], [AC_CHECK_FUNC(crypt, cmu_have_crypt=yes,
++               [AC_CHECK_LIB(crypt, crypt,
++                             LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
++                             cmu_have_crypt=no)])
++AC_SUBST(LIB_CRYPT)
++])
++m4trace:cmulocal/ucdsnmp.m4:71: -1- AC_DEFUN([CMU_UCDSNMP], [
++AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
++  AC_REQUIRE([CMU_SOCKETS])
++  AC_ARG_WITH(snmp, 
++              [  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) [yes] ],
++              with_snmp=$withval, with_snmp=yes)
++
++  dnl
++  dnl Maintain backwards compatibility with old --with-ucdsnmp option
++  dnl
++  AC_ARG_WITH(ucdsnmp,, with_snmp=$withval,)
++
++if test "$with_snmp" != "no"; then
++
++  dnl
++  dnl Try net-snmp first
++  dnl
++  if test "$with_snmp" = "yes"; then
++    AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH])
++  else
++    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
++  fi
++
++  if test -x "$SNMP_CONFIG"; then
++    AC_MSG_CHECKING(NET SNMP libraries)
++
++    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
++    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
++
++    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
++      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
++      LIB_UCDSNMP=$SNMP_LIBS
++      AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
++      AC_SUBST(LIB_UCDSNMP)
++      AC_MSG_RESULT(yes)
++    else
++      AC_MSG_RESULT(no)
++      AC_MSG_WARN([Could not find the required paths. Please check your net-snmp installation.])
++    fi
++  else
++    dnl
++    dnl Try ucd-snmp if net-snmp test failed
++    dnl
++    if test "$with_snmp" != no; then
++      if test -d "$with_snmp"; then
++        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
++        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
++      fi
++      cmu_save_LIBS="$LIBS"
++      AC_CHECK_LIB(snmp, sprint_objid, [
++  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)],
++  		 with_snmp=no, ${LIB_SOCKET})
++      LIBS="$cmu_save_LIBS"
++    fi
++    AC_MSG_CHECKING(UCD SNMP libraries)
++    AC_MSG_RESULT($with_snmp)
++    LIB_UCDSNMP=""
++    if test "$with_snmp" != no; then
++      AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
++      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++      AC_CHECK_LIB(rpm, rpmdbOpen,
++		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
++    fi
++    AC_SUBST(LIB_UCDSNMP)
++  fi
++fi
++
++])
++m4trace:configure.in:49: -1- AC_INIT([imap/imapd.c])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?A[CHUM]_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([_AC_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
++m4trace:configure.in:49: -1- m4_pattern_allow([^AS_FLAGS$])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?m4_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^dnl$])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?AS_])
++m4trace:configure.in:49: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
++m4trace:configure.in:49: -1- AC_SUBST([PATH_SEPARATOR])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
++m4trace:configure.in:49: -1- AC_SUBST([exec_prefix], [NONE])
++m4trace:configure.in:49: -1- AC_SUBST([prefix], [NONE])
++m4trace:configure.in:49: -1- AC_SUBST([program_transform_name], [s,x,x,])
++m4trace:configure.in:49: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
++m4trace:configure.in:49: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
++m4trace:configure.in:49: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
++m4trace:configure.in:49: -1- AC_SUBST([datadir], ['${prefix}/share'])
++m4trace:configure.in:49: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
++m4trace:configure.in:49: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
++m4trace:configure.in:49: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
++m4trace:configure.in:49: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
++m4trace:configure.in:49: -1- AC_SUBST([includedir], ['${prefix}/include'])
++m4trace:configure.in:49: -1- AC_SUBST([oldincludedir], ['/usr/include'])
++m4trace:configure.in:49: -1- AC_SUBST([infodir], ['${prefix}/info'])
++m4trace:configure.in:49: -1- AC_SUBST([mandir], ['${prefix}/man'])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
++#undef PACKAGE_NAME])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
++#undef PACKAGE_VERSION])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT])
++m4trace:configure.in:49: -1- AC_SUBST([build_alias])
++m4trace:configure.in:49: -1- AC_SUBST([host_alias])
++m4trace:configure.in:49: -1- AC_SUBST([target_alias])
++m4trace:configure.in:49: -1- AC_SUBST([DEFS])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_C])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_N])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_T])
++m4trace:configure.in:49: -1- AC_SUBST([LIBS])
++m4trace:configure.in:51: -1- AC_CONFIG_HEADERS([config.h])
++m4trace:configure.in:52: -1- AC_CANONICAL_HOST
++m4trace:configure.in:52: -1- AC_SUBST([build], [$ac_cv_build])
++m4trace:configure.in:52: -1- AC_SUBST([build_cpu], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:52: -1- AC_SUBST([build_vendor], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:52: -1- AC_SUBST([build_os], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host], [$ac_cv_host])
++m4trace:configure.in:52: -1- AC_SUBST([host_cpu], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:57: -1- AC_SUBST([WARNERROR])
++m4trace:configure.in:61: -1- AC_DEFINE_TRACE_LITERAL([EXTRA_IDENT])
++m4trace:configure.in:61: -1- AH_OUTPUT([EXTRA_IDENT], [/* Extra version information for imap/version.h */
++#undef EXTRA_IDENT])
++m4trace:configure.in:63: -1- AC_SUBST([MAKEDEPEND])
++m4trace:configure.in:69: -2- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++configure.in:69: the top level])
++m4trace:configure.in:73: -1- AC_SUBST([cyrus_prefix])
++m4trace:configure.in:74: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_PATH])
++m4trace:configure.in:74: -1- AH_OUTPUT([CYRUS_PATH], [/* Where will we be installed? */
++#undef CYRUS_PATH])
++m4trace:configure.in:77: -1- AC_SUBST([service_path])
++m4trace:configure.in:78: -1- AC_DEFINE_TRACE_LITERAL([SERVICE_PATH])
++m4trace:configure.in:78: -1- AH_OUTPUT([SERVICE_PATH], [/* Directiory to use for service binaries */
++#undef SERVICE_PATH])
++m4trace:configure.in:81: -1- AC_SUBST([cyrus_user])
++m4trace:configure.in:82: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_USER])
++m4trace:configure.in:82: -1- AH_OUTPUT([CYRUS_USER], [/* What user will we run as? */
++#undef CYRUS_USER])
++m4trace:configure.in:85: -1- AC_SUBST([cyrus_group])
++m4trace:configure.in:92: -1- AC_DEFINE_TRACE_LITERAL([SYSCONFDIR])
++m4trace:configure.in:92: -1- AH_OUTPUT([SYSCONFDIR], [/* Config File Location */
++#undef SYSCONFDIR])
++m4trace:configure.in:94: -1- AC_PROG_CC
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([CFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
++m4trace:configure.in:94: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
++m4trace:configure.in:95: -1- AC_PROG_RANLIB
++m4trace:configure.in:95: -1- AC_SUBST([RANLIB])
++m4trace:configure.in:95: -1- AC_SUBST([ac_ct_RANLIB])
++m4trace:configure.in:96: -1- AC_PROG_MAKE_SET
++m4trace:configure.in:96: -1- AC_SUBST([SET_MAKE])
++m4trace:configure.in:97: -1- AC_PROG_INSTALL
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_PROGRAM])
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_SCRIPT])
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_DATA])
++m4trace:configure.in:98: -1- AH_OUTPUT([_ALL_SOURCE], [/* Define to 1 if on AIX 3.
++   System headers sometimes define this.
++   We just want to avoid a redefinition error message.  */
++@%:@ifndef _ALL_SOURCE
++@%:@ undef _ALL_SOURCE
++@%:@endif])
++m4trace:configure.in:98: -1- AC_PROG_CPP
++m4trace:configure.in:98: -1- AC_SUBST([CPP])
++m4trace:configure.in:98: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:98: -1- AC_SUBST([CPP])
++m4trace:configure.in:98: -1- AC_SUBST([EGREP])
++m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
++m4trace:configure.in:99: -1- AC_CHECK_LIB([cposix], [strerror], [LIBS="$LIBS -lcposix"])
++m4trace:configure.in:100: -1- AC_PROG_AWK
++m4trace:configure.in:100: -1- AC_SUBST([AWK])
++m4trace:configure.in:101: -1- AC_C_CONST
++m4trace:configure.in:101: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:101: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:108: -1- AC_C_INLINE
++m4trace:configure.in:108: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:111: -1- AC_HEADER_STDC
++m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:111: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:111: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_LONG_INT])
++m4trace:configure.in:111: -1- AH_OUTPUT([SIZEOF_LONG_LONG_INT], [/* The size of a `long long int\', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT])
++m4trace:configure.in:112: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG_LONG_INT])
++m4trace:configure.in:112: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG_LONG_INT], [/* The size of a `unsigned long long int\', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT])
++m4trace:configure.in:115: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LONG_LONG_INT])
++m4trace:configure.in:115: -1- AH_OUTPUT([HAVE_LONG_LONG_INT], [/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT])
++m4trace:configure.in:116: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
++m4trace:configure.in:116: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN])
++m4trace:configure.in:119: -1- CMU_C___ATTRIBUTE__
++m4trace:configure.in:119: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/c-attribute.m4:30: CMU_C___ATTRIBUTE__ is expanded from...
++configure.in:119: the top level])
++m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
++m4trace:configure.in:119: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
++#undef HAVE___ATTRIBUTE__])
++m4trace:configure.in:120: -1- CMU_C_FPIC
++m4trace:configure.in:120: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/c-fpic.m4:34: CMU_C_FPIC is expanded from...
++configure.in:120: the top level])
++m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
++m4trace:configure.in:122: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
++#undef SIZEOF_LONG])
++m4trace:configure.in:125: -1- CMU_GUESS_RUNPATH_SWITCH
++m4trace:configure.in:127: -1- AC_CHECK_HEADERS([unistd.h sys/select.h sys/param.h stdarg.h])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
++#undef HAVE_SYS_SELECT_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the <stdarg.h> header file. */
++#undef HAVE_STDARG_H])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([memmove.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([strcasecmp.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([ftruncate.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([strerror.c])
++m4trace:configure.in:128: -1- AC_CHECK_FUNCS([memmove strcasecmp ftruncate strerror], [], [_AC_LIBOBJ($ac_func)])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define to 1 if you have the `memmove\' function. */
++#undef HAVE_MEMMOVE])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_STRCASECMP], [/* Define to 1 if you have the `strcasecmp\' function. */
++#undef HAVE_STRCASECMP])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_FTRUNCATE], [/* Define to 1 if you have the `ftruncate\' function. */
++#undef HAVE_FTRUNCATE])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
++#undef HAVE_STRERROR])
++m4trace:configure.in:128: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:129: -1- AC_CHECK_FUNCS([strlcat strlcpy])
++m4trace:configure.in:129: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define to 1 if you have the `strlcat\' function. */
++#undef HAVE_STRLCAT])
++m4trace:configure.in:129: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
++#undef HAVE_STRLCPY])
++m4trace:configure.in:130: -1- AC_HEADER_DIRENT
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_DIRENT_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_SYS_NDIR_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_SYS_DIR_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
++#undef HAVE_NDIR_H])
++m4trace:configure.in:133: -1- CMU_SOCKETS
++m4trace:configure.in:133: -2- AC_CHECK_LIB([nsl], [gethostbyname], [LIB_SOCKET="-lnsl $LIB_SOCKET"])
++m4trace:configure.in:133: -2- AC_CHECK_LIB([socket], [connect], [LIB_SOCKET="-lsocket $LIB_SOCKET"])
++m4trace:configure.in:133: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/bsd_sockets.m4:39: CMU_SOCKETS is expanded from...
++configure.in:133: the top level])
++m4trace:configure.in:133: -1- AC_CHECK_FUNCS([dn_expand dns_lookup])
++m4trace:configure.in:133: -1- AH_OUTPUT([HAVE_DN_EXPAND], [/* Define to 1 if you have the `dn_expand\' function. */
++#undef HAVE_DN_EXPAND])
++m4trace:configure.in:133: -1- AH_OUTPUT([HAVE_DNS_LOOKUP], [/* Define to 1 if you have the `dns_lookup\' function. */
++#undef HAVE_DNS_LOOKUP])
++m4trace:configure.in:133: -1- AC_SUBST([LIB_SOCKET])
++m4trace:configure.in:140: -1- IPv6_CHECK_FUNC([getaddrinfo], [IPv6_CHECK_FUNC(gai_strerror,
++	AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?]),
++	cyrus_cv_getaddrinfo=no)], [cyrus_cv_getaddrinfo=no])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [getaddrinfo], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getaddrinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, getaddrinfo, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [getaddrinfo], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:140: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -2- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- IPv6_CHECK_FUNC([gai_strerror], [
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETADDRINFO 
++_ACEOF
++], [cyrus_cv_getaddrinfo=no])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [gai_strerror], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_gai_strerror=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, gai_strerror, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [gai_strerror], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:148: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETNAMEINFO])
++m4trace:configure.in:148: -2- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Do we have a getnameinfo? */
++#undef HAVE_GETNAMEINFO])
++m4trace:configure.in:149: -1- IPv6_CHECK_FUNC([getnameinfo], [
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETNAMEINFO 
++_ACEOF
++], [cyrus_cv_getnameinfo=no])
++m4trace:configure.in:149: -1- AC_CHECK_LIB([socket], [getnameinfo], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getnameinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, getnameinfo, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:149: -1- AC_CHECK_LIB([inet6], [getnameinfo], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:149: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:149: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:155: -1- IPv6_CHECK_SS_FAMILY([])
++m4trace:configure.in:155: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/ipv6.m4:78: IPv6_CHECK_SS_FAMILY is expanded from...
++configure.in:155: the top level])
++m4trace:configure.in:155: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY])
++m4trace:configure.in:155: -2- AH_OUTPUT([HAVE_SS_FAMILY], [/* Is there an ss_family in sockaddr_storage? */
++#undef HAVE_SS_FAMILY])
++m4trace:configure.in:156: -1- IPv6_CHECK_SA_LEN([])
++m4trace:configure.in:156: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/ipv6.m4:94: IPv6_CHECK_SA_LEN is expanded from...
++configure.in:156: the top level])
++m4trace:configure.in:156: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
++m4trace:configure.in:156: -2- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* Does sockaddr have an sa_len? */
++#undef HAVE_SOCKADDR_SA_LEN])
++m4trace:configure.in:158: -1- AC_SUBST([IPV6_OBJS])
++m4trace:configure.in:161: -1- AC_CHECK_HEADERS([sys/time.h])
++m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H])
++m4trace:configure.in:162: -1- AC_HEADER_TIME
++m4trace:configure.in:162: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
++m4trace:configure.in:162: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME])
++m4trace:configure.in:163: -1- AC_STRUCT_TM
++m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
++m4trace:configure.in:163: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
++#undef TM_IN_SYS_TIME])
++m4trace:configure.in:164: -1- AC_STRUCT_TIMEZONE
++m4trace:configure.in:164: -1- AC_CHECK_MEMBERS([struct tm.tm_zone], [], [], [#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define to 1 if `tm_zone\' is member of `struct tm\'. */
++#undef HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_ZONE])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_TM_ZONE], [/* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
++   `HAVE_STRUCT_TM_TM_ZONE\' instead. */
++#undef HAVE_TM_ZONE])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TZNAME])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_TZNAME], [/* Define to 1 if you don\'t have `tm_zone\' but do have the external array
++   `tzname\'. */
++#undef HAVE_TZNAME])
++m4trace:configure.in:166: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:167: -1- AC_SUBST([PRE_SUBDIRS])
++m4trace:configure.in:168: -1- AC_SUBST([EXTRA_SUBDIRS])
++m4trace:configure.in:169: -1- AC_SUBST([DEPLIBS])
++m4trace:configure.in:170: -1- AC_SUBST([LOCALDEFS])
++m4trace:configure.in:171: -1- AC_FUNC_VPRINTF
++m4trace:configure.in:171: -1- AC_CHECK_FUNCS([vprintf], [
++AC_CHECK_FUNC(_doprnt,
++	       [AC_DEFINE(HAVE_DOPRNT, 1,
++			  [Define to 1 if you don't have `vprintf' but do have
++			  `_doprnt.'])])])
++m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_VPRINTF], [/* Define to 1 if you have the `vprintf\' function. */
++#undef HAVE_VPRINTF])
++m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DOPRNT])
++m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DOPRNT], [/* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
++#undef HAVE_DOPRNT])
++m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_CHK([])
++m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_OPTS
++m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_CHK_LIB([])
++m4trace:configure.in:204: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [LDFLAGS])
++m4trace:configure.in:204: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [BDB_LIBADD])
++m4trace:configure.in:204: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
++configure.in:204: the top level])
++m4trace:configure.in:204: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
++configure.in:204: the top level])
++m4trace:configure.in:208: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++configure.in:208: the top level])
++m4trace:configure.in:212: -1- CMU_ADD_LIBPATH([$with_bdb_lib])
++m4trace:configure.in:217: -1- AC_SUBST([BDB_INC])
++m4trace:configure.in:218: -1- AC_SUBST([BDB_LIB])
++m4trace:configure.in:224: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BDB])
++m4trace:configure.in:224: -1- AH_OUTPUT([HAVE_BDB], [/* Build in Berkeley DB support? */
++#undef HAVE_BDB])
++m4trace:configure.in:229: -1- AC_SUBST([CYRUSDB_OBJS])
++m4trace:configure.in:241: -1- AC_SUBST([SIEVE_OBJS])
++m4trace:configure.in:243: -1- AC_SUBST([SIEVE_LIBS])
++m4trace:configure.in:245: -1- AC_SUBST([SIEVE_CPPFLAGS])
++m4trace:configure.in:246: -1- AC_DEFINE_TRACE_LITERAL([USE_SIEVE])
++m4trace:configure.in:246: -1- AH_OUTPUT([USE_SIEVE], [/* Build in Sieve support? */
++#undef USE_SIEVE])
++m4trace:configure.in:249: -1- AC_PROG_YACC
++m4trace:configure.in:249: -1- AC_SUBST([YACC])
++m4trace:configure.in:250: -1- AC_PROG_LEX
++m4trace:configure.in:250: -1- AC_SUBST([LEX])
++m4trace:configure.in:250: -1- AC_CHECK_LIB([fl], [yywrap], [LEXLIB="-lfl"], [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
++m4trace:configure.in:250: -1- AC_CHECK_LIB([l], [yywrap], [LEXLIB="-ll"])
++m4trace:configure.in:250: -1- AC_SUBST([LEXLIB])
++m4trace:configure.in:250: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
++m4trace:configure.in:250: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
++m4trace:configure.in:250: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
++   `char[]\'. */
++#undef YYTEXT_POINTER])
++m4trace:configure.in:251: -1- AC_CHECK_LIB([fl], [main])
++m4trace:configure.in:251: -1- AH_OUTPUT([HAVE_LIBFL], [/* Define to 1 if you have the `fl\' library (-lfl). */
++#undef HAVE_LIBFL])
++m4trace:configure.in:251: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFL])
++m4trace:configure.in:255: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_REGEX])
++m4trace:configure.in:255: -1- AH_OUTPUT([ENABLE_REGEX], [/* Do we have a decent regex library? */
++#undef ENABLE_REGEX])
++m4trace:configure.in:255: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RX])
++m4trace:configure.in:255: -2- AH_OUTPUT([HAVE_RX], [/* Do we have rxposix.h? */
++#undef HAVE_RX])
++m4trace:configure.in:262: -1- AC_SUBST([SIEVE_SUBDIRS])
++m4trace:configure.in:265: -2- AC_DEFINE_TRACE_LITERAL([HAS_STRERROR])
++m4trace:configure.in:265: -2- AH_OUTPUT([HAS_STRERROR], [/* Do we have strerror()? */
++#undef HAS_STRERROR])
++m4trace:configure.in:266: -2- AC_DEFINE_TRACE_LITERAL([NEED_SYS_ERRLIST])
++m4trace:configure.in:266: -2- AH_OUTPUT([NEED_SYS_ERRLIST], [/* Do we have a sys_errlist? */
++#undef NEED_SYS_ERRLIST])
++m4trace:configure.in:266: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
++You should run autoupdate.], [autoconf/functions.m4:111: AC_FUNC_CHECK is expanded from...
++configure.in:266: the top level])
++m4trace:configure.in:269: -1- AC_CHECK_HEADERS([sys/resource.h])
++m4trace:configure.in:269: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
++#undef HAVE_SYS_RESOURCE_H])
++m4trace:configure.in:270: -1- AC_CHECK_FUNCS([setrlimit])
++m4trace:configure.in:270: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define to 1 if you have the `setrlimit\' function. */
++#undef HAVE_SETRLIMIT])
++m4trace:configure.in:271: -1- AC_CHECK_FUNCS([getrlimit])
++m4trace:configure.in:271: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
++#undef HAVE_GETRLIMIT])
++m4trace:configure.in:274: -1- AC_CHECK_FUNCS([daemon setsid])
++m4trace:configure.in:274: -1- AH_OUTPUT([HAVE_DAEMON], [/* Define to 1 if you have the `daemon\' function. */
++#undef HAVE_DAEMON])
++m4trace:configure.in:274: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
++#undef HAVE_SETSID])
++m4trace:configure.in:277: -1- AC_CHECK_FUNCS([shutdown])
++m4trace:configure.in:277: -1- AH_OUTPUT([HAVE_SHUTDOWN], [/* Define to 1 if you have the `shutdown\' function. */
++#undef HAVE_SHUTDOWN])
++m4trace:configure.in:279: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKLEN_T])
++m4trace:configure.in:279: -2- AH_OUTPUT([HAVE_SOCKLEN_T], [/* Do we have a socklen_t? */
++#undef HAVE_SOCKLEN_T])
++m4trace:configure.in:281: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:281: -2- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_STORAGE], [/* Do we have a sockaddr_storage? */
++#undef HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:282: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RLIM_T])
++m4trace:configure.in:282: -2- AH_OUTPUT([HAVE_RLIM_T], [/* Do we have an rlim_t? */
++#undef HAVE_RLIM_T])
++m4trace:configure.in:290: -1- AC_CHECK_LIB([util], [setproctitle], [spt_type=SPT_BUILTIN
++			LIBS="${LIBS} -lutil"])
++m4trace:configure.in:305: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:305: the top level])
++m4trace:configure.in:316: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:316: the top level])
++m4trace:configure.in:327: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:327: the top level])
++m4trace:configure.in:334: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
++m4trace:configure.in:334: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
++#undef SPT_TYPE])
++m4trace:configure.in:344: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++configure.in:344: the top level])
++m4trace:configure.in:346: -1- AC_SUBST([WITH_NONBLOCK])
++m4trace:configure.in:353: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++configure.in:353: the top level])
++m4trace:configure.in:355: -1- AC_SUBST([WITH_GMTOFF])
++m4trace:configure.in:383: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++configure.in:383: the top level])
++m4trace:configure.in:415: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++configure.in:415: the top level])
++m4trace:configure.in:426: -1- AC_SUBST([WITH_MAP])
++m4trace:configure.in:435: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
++autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++configure.in:435: the top level])
++m4trace:configure.in:437: -1- AC_SUBST([WITH_LOCK])
++m4trace:configure.in:441: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:441: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++#undef HAVE_FDATASYNC])
++m4trace:configure.in:446: -1- AC_CHECK_LIB([rt], [fdatasync], [
++	LIB_RT="-lrt"
++	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
++  ])
++m4trace:configure.in:446: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:446: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++#undef HAVE_FDATASYNC])
++m4trace:configure.in:467: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
++    dnl not hp flavor
++    SAVE_LDFLAGS="$LDFLAGS"
++    dnl solaris flavor
++    LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
++    AC_CHECK_LIB(ucb, sigvec, [
++      dnl more solaris flavor
++      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
++      [ cant_find_sigvec=yes ])
++    LDFLAGS="$SAVE_LDFLAGS"])
++m4trace:configure.in:467: -1- AC_CHECK_LIB([ucb], [sigvec], [
++      dnl more solaris flavor
++      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"], [ cant_find_sigvec=yes ])
++m4trace:configure.in:468: -1- AC_SUBST([cyrus_sigveclib])
++m4trace:configure.in:482: -1- SASL_SET_GSSAPI_LIBS
++m4trace:configure.in:482: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
++m4trace:configure.in:482: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
++#undef AFSPTS_USE_KRB5])
++m4trace:configure.in:494: -1- CMU_ADD_LIBPATH_TO([/usr/ucblib], [AFS_LDFLAGS])
++m4trace:configure.in:515: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++configure.in:515: the top level])
++m4trace:configure.in:521: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:522: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:523: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:523: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++#undef HAVE_AFSKRB])
++m4trace:configure.in:527: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:528: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:529: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:529: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++#undef HAVE_AFSKRB])
++m4trace:configure.in:557: -1- AC_CHECK_LIB([ldap], [ldap_initialize], [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
++          AC_SUBST(LDAP_CPPFLAGS)
++          AC_SUBST(LDAP_LDFLAGS)
++          AC_SUBST(LDAP_LIBS)	
++          LDAP_LIBS="-lldap -llber" ], [], [-llber])
++m4trace:configure.in:557: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
++m4trace:configure.in:557: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
++#undef HAVE_LDAP])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_CPPFLAGS])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_LDFLAGS])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_LIBS])
++m4trace:configure.in:566: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
++m4trace:configure.in:566: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
++#undef WITH_PTS])
++m4trace:configure.in:575: -1- AC_SUBST([SERVER_SUBDIRS])
++m4trace:configure.in:593: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:593: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++#undef HAVE_LIBRESOLV])
++m4trace:configure.in:593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:610: -1- AC_CHECK_LIB([des], [des_ecb_encrypt], [if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$with_krb/lib/libdes.a"
++      else
++          KRB_LIBS="-ldes"
++      fi], [{ { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
++echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
++   { (exit 1); exit 1; }; }])
++m4trace:configure.in:630: -1- CMU_ADD_LIBPATH([${with_krb}/lib])
++m4trace:configure.in:647: -3- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:647: the top level])
++m4trace:configure.in:648: -2- AC_CHECK_LIB([${KRBLIB}], [krb_mk_priv], [if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
++      else
++          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
++      fi], [{ echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no], [$KRB_LIBS])
++m4trace:configure.in:649: -2- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:649: the top level])
++m4trace:configure.in:651: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:651: the top level])
++m4trace:configure.in:656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
++m4trace:configure.in:656: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
++#undef HAVE_KRB])
++m4trace:configure.in:661: -1- SASL_SET_GSSAPI_LIBS
++m4trace:configure.in:680: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
++m4trace:configure.in:685: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
++m4trace:configure.in:687: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
++m4trace:configure.in:694: -1- CMU_ADD_LIBPATH([${OPENSSL_LIBPATH}])
++m4trace:configure.in:695: -1- CMU_ADD_LIBPATH_TO([${OPENSSL_LIBPATH}], [OPENSSL_LIB])
++m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
++m4trace:configure.in:703: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
++#undef HAVE_SSL])
++m4trace:configure.in:706: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
++m4trace:configure.in:706: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
++#undef OPENSSL_ENABLE_OLD_DES_SUPPORT])
++m4trace:configure.in:707: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
++m4trace:configure.in:707: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
++#undef OPENSSL_DES_LIBDES_COMPATIBILITY])
++m4trace:configure.in:710: -1- AC_SUBST([OPENSSL_INC])
++m4trace:configure.in:711: -1- AC_SUBST([OPENSSL_LIB])
++m4trace:configure.in:722: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
++m4trace:configure.in:722: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
++#undef EGD_SOCKET])
++m4trace:configure.in:742: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
++m4trace:configure.in:750: -1- AC_SUBST([ZEPHYR_LIBS])
++m4trace:configure.in:751: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
++m4trace:configure.in:753: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
++m4trace:configure.in:753: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
++#undef HAVE_ZEPHYR])
++m4trace:configure.in:763: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
++m4trace:configure.in:763: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
++#undef MASTER_PIDFILE])
++m4trace:configure.in:771: -1- AC_SUBST([WITH_IDLE])
++m4trace:configure.in:796: -1- AC_SUBST([IMAP_PROGS])
++m4trace:configure.in:828: -1- AC_CHECK_LIB([com_err], [com_err], [
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		AC_CHECK_HEADER(et/com_err.h,
++		  [AC_DEFINE(HAVE_ET_COM_ERR_H,[],[We need et/com_err.h])],
++		  [AC_CHECK_HEADER(com_err.h,[],[AC_ERROR([cannot locate com_err.h])])])
++		AC_PATH_PROG(COMPILE_ET, compile_et, [no compile et])
++	], [
++	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
++		with_com_err="/usr/local"
++		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, [no compile et])
++	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
++		with_com_err="/usr"
++		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, [no compile et])
++	else
++		# use ours
++		with_com_err=yes
++	fi
++	])
++m4trace:configure.in:828: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
++m4trace:configure.in:828: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
++#undef HAVE_ET_COM_ERR_H])
++m4trace:configure.in:828: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/libs.m4:134: AC_CHECK_LIB is expanded from...
++configure.in:828: the top level])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:869: -1- AC_SUBST([COMPILE_ET])
++m4trace:configure.in:870: -1- AC_SUBST([COM_ERR_LIBS])
++m4trace:configure.in:871: -1- AC_SUBST([COM_ERR_LDFLAGS])
++m4trace:configure.in:872: -1- AC_SUBST([COM_ERR_CPPFLAGS])
++m4trace:configure.in:878: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:878: the top level])
++m4trace:configure.in:893: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
++m4trace:configure.in:893: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
++#undef SYSLOG_FACILITY])
++m4trace:configure.in:897: -1- AC_LIBSOURCE([getdtablesize.c])
++m4trace:configure.in:897: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
++m4trace:configure.in:897: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
++#undef HAVE_GETDTABLESIZE])
++m4trace:configure.in:897: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:910: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
++m4trace:configure.in:910: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
++#undef OLD_SIEVE_SERVICE_NAME])
++m4trace:configure.in:919: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
++m4trace:configure.in:919: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
++#undef ENABLE_LISTEXT])
++m4trace:configure.in:926: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
++m4trace:configure.in:926: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
++#undef ENABLE_X_NETSCAPE_HACK])
++m4trace:configure.in:929: -1- AC_CHECK_LIB([dl], [dlopen])
++m4trace:configure.in:929: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
++#undef HAVE_LIBDL])
++m4trace:configure.in:929: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
++m4trace:configure.in:930: -1- CMU_SASL2_REQUIRE_VER([2], [1], [7])
++m4trace:configure.in:930: -1- CMU_SASL2_REQUIRED
++m4trace:configure.in:930: -1- CMU_SASL2
++m4trace:configure.in:930: -1- SASL_GSSAPI_CHK
++m4trace:configure.in:930: -1- SASL2_CRYPT_CHK
++m4trace:configure.in:930: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_CRYPT])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
++#undef HAVE_GSSAPI_H])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++#undef HAVE_LIBRESOLV])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gssapi], [gss_unwrap], [gss_impl="heimdal"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET}])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gssapi_krb5], [gss_unwrap], [gss_impl="mit"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET}])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe03"], [unset ac_cv_lib_gss_csf_gss_acq_user;
++                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
++                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)], [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
++m4trace:configure.in:930: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [/* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
++   */
++#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
++m4trace:configure.in:930: -1- AC_SUBST([GSSAPI_LIBS])
++m4trace:configure.in:930: -1- AC_SUBST([GSSAPIBASE_LIBS])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [LIB_DYN_SASL])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
++m4trace:configure.in:930: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [DYNLIB_SASL])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_DYN_SASL])
++m4trace:configure.in:930: -1- AC_SUBST([DYNSASLFLAGS])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_SASL])
++m4trace:configure.in:930: -1- AC_SUBST([SASLFLAGS])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/general.m4:2087: _AC_PREPROC_IFELSE is expanded from...
++autoconf/general.m4:2097: AC_PREPROC_IFELSE is expanded from...
++autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:931: -1- CMU_SASL2_CHECKAPOP_REQUIRED
++m4trace:configure.in:931: -1- AC_CHECK_LIB([sasl2], [sasl_checkapop], [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])], [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
++m4trace:configure.in:931: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
++m4trace:configure.in:931: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
++#undef HAVE_APOP])
++m4trace:configure.in:944: -1- AC_SUBST([PERL])
++m4trace:configure.in:960: -1- AC_SUBST([PERL_CCCDLFLAGS])
++m4trace:configure.in:978: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
++m4trace:configure.in:978: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
++You should run autoupdate.], [autoconf/functions.m4:111: AC_FUNC_CHECK is expanded from...
++configure.in:978: the top level])
++m4trace:configure.in:979: -1- AC_SUBST([MD5OBJ])
++m4trace:configure.in:984: -1- AC_SUBST([SNMP_SUBDIRS])
++m4trace:configure.in:986: -1- CMU_LIBWRAP
++m4trace:configure.in:986: -1- CMU_FIND_LIB_SUBDIR
++m4trace:configure.in:986: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++cmulocal/common.m4:61: CMU_FIND_LIB_SUBDIR is expanded from...
++configure.in:986: CMU_FIND_LIB_SUBDIR is required by...
++cmulocal/libwrap.m4:30: CMU_LIBWRAP is expanded from...
++configure.in:986: the top level])
++m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
++m4trace:configure.in:986: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
++#undef SIZEOF_LONG])
++m4trace:configure.in:986: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
++m4trace:configure.in:986: -1- AC_CHECK_LIB([wrap], [request_init], [
++		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], [with_libwrap=no], [${LIB_SOCKET}])
++m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
++m4trace:configure.in:986: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
++#undef HAVE_LIBWRAP])
++m4trace:configure.in:986: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
++m4trace:configure.in:986: -1- AC_SUBST([LIB_WRAP])
++m4trace:configure.in:987: -1- CMU_UCDSNMP
++m4trace:configure.in:987: -1- AC_SUBST([SNMP_CONFIG], [$ac_cv_path_SNMP_CONFIG])
++m4trace:configure.in:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
++m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
++#undef HAVE_NETSNMP])
++m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:987: -1- AC_CHECK_LIB([snmp], [sprint_objid], [
++  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)], [with_snmp=no], [${LIB_SOCKET}])
++m4trace:configure.in:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
++m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
++#undef HAVE_UCDSNMP])
++m4trace:configure.in:987: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
++m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:1022: -1- AC_SUBST([LIB_RT])
++m4trace:configure.in:1023: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
++m4trace:configure.in:1024: -1- AC_SUBST([IMAP_LIBS])
++m4trace:configure.in:1032: -1- AC_SUBST([PERL_SUBDIRS])
++m4trace:configure.in:1033: -1- AC_SUBST([PERL_DEPSUBDIRS])
++m4trace:configure.in:1034: -1- AC_SUBST([PERL])
++m4trace:configure.in:1080: -1- AH_OUTPUT([00001], [
++/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef _CYRUS_IMAPD_CONFIG_H_
++#define _CYRUS_IMAPD_CONFIG_H_
++])
++m4trace:configure.in:1229: -1- AH_OUTPUT([zzzz2], [
++/* time.h */
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++/* com_err.h, as needed */
++#ifndef IN_COM_ERR
++#ifdef HAVE_ET_COM_ERR_H
++#include <et/com_err.h>
++#else
++#include <com_err.h>
++#endif /* HAVE_ET_COM_ERR_H */
++#endif /* IN_COM_ERR */
++
++/* This allows us to work even when we don\'t have an fdatasync */
++#ifndef HAVE_FDATASYNC
++#define fdatasync(fd) fsync(fd)
++#endif
++
++/* A similar setup for not having O_DSYNC */
++#include <fcntl.h>
++
++#ifndef O_DSYNC
++#  ifdef O_SYNC
++#    define O_DSYNC     O_SYNC          /* POSIX */
++#  else
++#    define O_DSYNC     O_FSYNC         /* BSD */
++#  endif
++#endif
++
++#ifndef HAVE___ATTRIBUTE__
++/* Can\'t use attributes... */
++#define __attribute__(foo)
++#endif
++
++#ifndef HAVE_SOCKLEN_T
++typedef unsigned int socklen_t;
++#endif
++
++#ifndef HAVE_RLIM_T
++typedef int rlim_t;
++#endif
++
++/* some potentially memory saving tradeoffs, 
++   preconfigured in memory-saving mode */
++
++/* save the cmdlines for the ID command */
++#undef ID_SAVE_CMDLINE
++
++/* IPv6 things */
++#include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
++#define	_SS_MAXSIZE	128	/* Implementation specific max size */
++#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
++
++struct sockaddr_storage {
++	struct	sockaddr ss_sa;
++	char		__ss_pad2[_SS_PADSIZE];
++};
++# define ss_family ss_sa.sa_family
++# define HAVE_SS_FAMILY
++#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
++
++#ifndef HAVE_SS_FAMILY
++#define ss_family	__ss_family
++#endif
++
++#ifndef AF_INET6
++/* Define it to something that should never appear */
++#define	AF_INET6	AF_MAX
++#endif
++
++#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
++#include "gai.h"
++#endif
++
++/* End IPv6 things */
++
++#ifdef OLD_SIEVE_SERVICE_NAME
++#define SIEVE_SERVICE_NAME "imap"
++#else
++#define SIEVE_SERVICE_NAME "sieve"
++#endif
++
++/* filenames */
++#define FNAME_DBDIR "/db"
++#define FNAME_USERDIR "/user/"
++#define FNAME_DOMAINDIR "/domain/"
++#define FNAME_LOGDIR "/log/"
++#define FNAME_PTSDB "/ptclient/ptscache.db"
++#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
++#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
++
++#ifndef HAVE_SHUTDOWN
++#define shutdown(fd, mode) 0
++#endif
++
++/* compile time options; think carefully before modifying */
++enum {
++    /* should we send an UNAVAILABLE message to master when
++     * a service is exiting (master is already going to be 
++     * informed of the exit by the SIGCHLD signal anyway) ? */
++    MESSAGE_MASTER_ON_EXIT = 0,
++
++    /* should a hierarchical rename stop on error? */
++    RENAME_STOP_ON_ERROR = 1,
++
++    /* should we call fsync() to maybe help with softupdates? (it should) */
++    APPEND_ULTRA_PARANOID = 1,
++
++    /* should we log extra information at the DEBUG level for DB stuff? 
++     * 0 -> nothing; 1 -> some; higher -> even more */
++    CONFIG_DB_VERBOSE = 1,
++
++    /* log timing information to LOG_DEBUG */
++    CONFIG_TIMING_VERBOSE = 0,
++
++    /* should we be pedantic about namespace or sleezy? */
++    SLEEZY_NAMESPACE = 1,
++
++    /* should we do a fast TLS session shutdown? */
++    TLS_FAST_SHUTDOWN = 1,
++
++    /* should we use the SQUAT engine to accelerate SEARCH? */
++    SQUAT_ENGINE = 1,
++
++    /* should we have long LMTP error messages? */
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
++};
++
++#endif /* _CYRUS_IMAPD_CONFIG_H_ */
++])
++m4trace:configure.in:1232: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
++m4trace:configure.in:1232: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
++You should run autoupdate.], [])
++m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1
+--- cyrus-imapd-2.2.13/autom4te.cache/traces.1	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1	2006-05-19 15:21:21.143750070 +0200
+@@ -0,0 +1,1152 @@
++m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
++m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
++m4trace:aclocal.m4:16: -1- m4_include([cmulocal/c-attribute.m4])
++m4trace:aclocal.m4:17: -1- m4_include([cmulocal/c-fpic.m4])
++m4trace:aclocal.m4:18: -1- m4_include([cmulocal/common.m4])
++m4trace:aclocal.m4:19: -1- m4_include([cmulocal/cyrus.m4])
++m4trace:aclocal.m4:20: -1- m4_include([cmulocal/ipv6.m4])
++m4trace:aclocal.m4:21: -1- m4_include([cmulocal/libwrap.m4])
++m4trace:aclocal.m4:22: -1- m4_include([cmulocal/sasl2.m4])
++m4trace:aclocal.m4:23: -1- m4_include([cmulocal/ucdsnmp.m4])
++m4trace:configure.in:49: -1- AC_INIT([imap/imapd.c])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?A[CHUM]_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([_AC_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
++m4trace:configure.in:49: -1- m4_pattern_allow([^AS_FLAGS$])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?m4_])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^dnl$])
++m4trace:configure.in:49: -1- m4_pattern_forbid([^_?AS_])
++m4trace:configure.in:49: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
++m4trace:configure.in:49: -1- AC_SUBST([PATH_SEPARATOR])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
++m4trace:configure.in:49: -1- AC_SUBST([exec_prefix], [NONE])
++m4trace:configure.in:49: -1- AC_SUBST([prefix], [NONE])
++m4trace:configure.in:49: -1- AC_SUBST([program_transform_name], [s,x,x,])
++m4trace:configure.in:49: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
++m4trace:configure.in:49: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
++m4trace:configure.in:49: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
++m4trace:configure.in:49: -1- AC_SUBST([datadir], ['${prefix}/share'])
++m4trace:configure.in:49: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
++m4trace:configure.in:49: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
++m4trace:configure.in:49: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
++m4trace:configure.in:49: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
++m4trace:configure.in:49: -1- AC_SUBST([includedir], ['${prefix}/include'])
++m4trace:configure.in:49: -1- AC_SUBST([oldincludedir], ['/usr/include'])
++m4trace:configure.in:49: -1- AC_SUBST([infodir], ['${prefix}/info'])
++m4trace:configure.in:49: -1- AC_SUBST([mandir], ['${prefix}/man'])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
++#undef PACKAGE_NAME])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
++#undef PACKAGE_VERSION])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING])
++m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
++m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT])
++m4trace:configure.in:49: -1- AC_SUBST([build_alias])
++m4trace:configure.in:49: -1- AC_SUBST([host_alias])
++m4trace:configure.in:49: -1- AC_SUBST([target_alias])
++m4trace:configure.in:49: -1- AC_SUBST([DEFS])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_C])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_N])
++m4trace:configure.in:49: -1- AC_SUBST([ECHO_T])
++m4trace:configure.in:49: -1- AC_SUBST([LIBS])
++m4trace:configure.in:51: -1- AC_CONFIG_HEADERS([config.h])
++m4trace:configure.in:52: -1- AC_CANONICAL_HOST
++m4trace:configure.in:52: -1- AC_SUBST([build], [$ac_cv_build])
++m4trace:configure.in:52: -1- AC_SUBST([build_cpu], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:52: -1- AC_SUBST([build_vendor], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:52: -1- AC_SUBST([build_os], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host], [$ac_cv_host])
++m4trace:configure.in:52: -1- AC_SUBST([host_cpu], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:52: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:57: -1- AC_SUBST([WARNERROR])
++m4trace:configure.in:61: -1- AC_DEFINE_TRACE_LITERAL([EXTRA_IDENT])
++m4trace:configure.in:61: -1- AH_OUTPUT([EXTRA_IDENT], [/* Extra version information for imap/version.h */
++#undef EXTRA_IDENT])
++m4trace:configure.in:63: -1- AC_SUBST([MAKEDEPEND])
++m4trace:configure.in:69: -2- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++configure.in:69: the top level])
++m4trace:configure.in:73: -1- AC_SUBST([cyrus_prefix])
++m4trace:configure.in:74: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_PATH])
++m4trace:configure.in:74: -1- AH_OUTPUT([CYRUS_PATH], [/* Where will we be installed? */
++#undef CYRUS_PATH])
++m4trace:configure.in:77: -1- AC_SUBST([service_path])
++m4trace:configure.in:78: -1- AC_DEFINE_TRACE_LITERAL([SERVICE_PATH])
++m4trace:configure.in:78: -1- AH_OUTPUT([SERVICE_PATH], [/* Directiory to use for service binaries */
++#undef SERVICE_PATH])
++m4trace:configure.in:81: -1- AC_SUBST([cyrus_user])
++m4trace:configure.in:82: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_USER])
++m4trace:configure.in:82: -1- AH_OUTPUT([CYRUS_USER], [/* What user will we run as? */
++#undef CYRUS_USER])
++m4trace:configure.in:85: -1- AC_SUBST([cyrus_group])
++m4trace:configure.in:92: -1- AC_DEFINE_TRACE_LITERAL([SYSCONFDIR])
++m4trace:configure.in:92: -1- AH_OUTPUT([SYSCONFDIR], [/* Config File Location */
++#undef SYSCONFDIR])
++m4trace:configure.in:94: -1- AC_PROG_CC
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([CFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([CC])
++m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:94: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
++m4trace:configure.in:94: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
++m4trace:configure.in:95: -1- AC_PROG_RANLIB
++m4trace:configure.in:95: -1- AC_SUBST([RANLIB])
++m4trace:configure.in:95: -1- AC_SUBST([ac_ct_RANLIB])
++m4trace:configure.in:96: -1- AC_PROG_MAKE_SET
++m4trace:configure.in:96: -1- AC_SUBST([SET_MAKE])
++m4trace:configure.in:97: -1- AC_PROG_INSTALL
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_PROGRAM])
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_SCRIPT])
++m4trace:configure.in:97: -1- AC_SUBST([INSTALL_DATA])
++m4trace:configure.in:98: -1- AH_OUTPUT([_ALL_SOURCE], [/* Define to 1 if on AIX 3.
++   System headers sometimes define this.
++   We just want to avoid a redefinition error message.  */
++@%:@ifndef _ALL_SOURCE
++@%:@ undef _ALL_SOURCE
++@%:@endif])
++m4trace:configure.in:98: -1- AC_PROG_CPP
++m4trace:configure.in:98: -1- AC_SUBST([CPP])
++m4trace:configure.in:98: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:98: -1- AC_SUBST([CPP])
++m4trace:configure.in:98: -1- AC_SUBST([EGREP])
++m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
++m4trace:configure.in:100: -1- AC_PROG_AWK
++m4trace:configure.in:100: -1- AC_SUBST([AWK])
++m4trace:configure.in:101: -1- AC_C_CONST
++m4trace:configure.in:101: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:101: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:108: -1- AC_C_INLINE
++m4trace:configure.in:108: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:111: -1- AC_HEADER_STDC
++m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:111: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:111: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H])
++m4trace:configure.in:111: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_LONG_INT])
++m4trace:configure.in:111: -1- AH_OUTPUT([SIZEOF_LONG_LONG_INT], [/* The size of a `long long int\', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT])
++m4trace:configure.in:112: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG_LONG_INT])
++m4trace:configure.in:112: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG_LONG_INT], [/* The size of a `unsigned long long int\', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT])
++m4trace:configure.in:115: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LONG_LONG_INT])
++m4trace:configure.in:115: -1- AH_OUTPUT([HAVE_LONG_LONG_INT], [/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT])
++m4trace:configure.in:116: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
++m4trace:configure.in:116: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN])
++m4trace:configure.in:119: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/c-attribute.m4:30: CMU_C___ATTRIBUTE__ is expanded from...
++configure.in:119: the top level])
++m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
++m4trace:configure.in:119: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
++#undef HAVE___ATTRIBUTE__])
++m4trace:configure.in:120: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/c-fpic.m4:34: CMU_C_FPIC is expanded from...
++configure.in:120: the top level])
++m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
++m4trace:configure.in:122: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
++#undef SIZEOF_LONG])
++m4trace:configure.in:127: -1- AC_CHECK_HEADERS([unistd.h sys/select.h sys/param.h stdarg.h])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
++#undef HAVE_SYS_SELECT_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H])
++m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the <stdarg.h> header file. */
++#undef HAVE_STDARG_H])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([memmove.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([strcasecmp.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([ftruncate.c])
++m4trace:configure.in:128: -1- AC_LIBSOURCE([strerror.c])
++m4trace:configure.in:128: -1- AC_CHECK_FUNCS([memmove strcasecmp ftruncate strerror], [], [_AC_LIBOBJ($ac_func)])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define to 1 if you have the `memmove\' function. */
++#undef HAVE_MEMMOVE])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_STRCASECMP], [/* Define to 1 if you have the `strcasecmp\' function. */
++#undef HAVE_STRCASECMP])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_FTRUNCATE], [/* Define to 1 if you have the `ftruncate\' function. */
++#undef HAVE_FTRUNCATE])
++m4trace:configure.in:128: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
++#undef HAVE_STRERROR])
++m4trace:configure.in:128: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:129: -1- AC_CHECK_FUNCS([strlcat strlcpy])
++m4trace:configure.in:129: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define to 1 if you have the `strlcat\' function. */
++#undef HAVE_STRLCAT])
++m4trace:configure.in:129: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
++#undef HAVE_STRLCPY])
++m4trace:configure.in:130: -1- AC_HEADER_DIRENT
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_DIRENT_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_SYS_NDIR_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
++   */
++#undef HAVE_SYS_DIR_H])
++m4trace:configure.in:130: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
++#undef HAVE_NDIR_H])
++m4trace:configure.in:133: -2- AC_CHECK_LIB([nsl], [gethostbyname], [LIB_SOCKET="-lnsl $LIB_SOCKET"])
++m4trace:configure.in:133: -2- AC_CHECK_LIB([socket], [connect], [LIB_SOCKET="-lsocket $LIB_SOCKET"])
++m4trace:configure.in:133: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/bsd_sockets.m4:39: CMU_SOCKETS is expanded from...
++configure.in:133: the top level])
++m4trace:configure.in:133: -1- AC_CHECK_FUNCS([dn_expand dns_lookup])
++m4trace:configure.in:133: -1- AH_OUTPUT([HAVE_DN_EXPAND], [/* Define to 1 if you have the `dn_expand\' function. */
++#undef HAVE_DN_EXPAND])
++m4trace:configure.in:133: -1- AH_OUTPUT([HAVE_DNS_LOOKUP], [/* Define to 1 if you have the `dns_lookup\' function. */
++#undef HAVE_DNS_LOOKUP])
++m4trace:configure.in:133: -1- AC_SUBST([LIB_SOCKET])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [getaddrinfo], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getaddrinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, getaddrinfo, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [getaddrinfo], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:140: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -2- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [gai_strerror], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_gai_strerror=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, gai_strerror, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [gai_strerror], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:148: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETNAMEINFO])
++m4trace:configure.in:148: -2- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Do we have a getnameinfo? */
++#undef HAVE_GETNAMEINFO])
++m4trace:configure.in:149: -1- AC_CHECK_LIB([socket], [getnameinfo], [dnl
++    LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
++  ], [dnl
++    AC_MSG_CHECKING([whether your system has IPv6 directory])
++    AC_CACHE_VAL(ipv6_cv_dir, [dnl
++      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done])dnl
++    AC_MSG_RESULT($ipv6_cv_dir)
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getnameinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      AC_CHECK_LIB(inet6, getnameinfo, [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi],)dnl
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi])
++m4trace:configure.in:149: -1- AC_CHECK_LIB([inet6], [getnameinfo], [dnl
++	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi], [])
++m4trace:configure.in:149: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
++m4trace:configure.in:149: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:155: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/ipv6.m4:78: IPv6_CHECK_SS_FAMILY is expanded from...
++configure.in:155: the top level])
++m4trace:configure.in:155: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY])
++m4trace:configure.in:155: -2- AH_OUTPUT([HAVE_SS_FAMILY], [/* Is there an ss_family in sockaddr_storage? */
++#undef HAVE_SS_FAMILY])
++m4trace:configure.in:156: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++cmulocal/ipv6.m4:94: IPv6_CHECK_SA_LEN is expanded from...
++configure.in:156: the top level])
++m4trace:configure.in:156: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
++m4trace:configure.in:156: -2- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* Does sockaddr have an sa_len? */
++#undef HAVE_SOCKADDR_SA_LEN])
++m4trace:configure.in:158: -1- AC_SUBST([IPV6_OBJS])
++m4trace:configure.in:161: -1- AC_CHECK_HEADERS([sys/time.h])
++m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H])
++m4trace:configure.in:162: -1- AC_HEADER_TIME
++m4trace:configure.in:162: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
++m4trace:configure.in:162: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME])
++m4trace:configure.in:163: -1- AC_STRUCT_TM
++m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
++m4trace:configure.in:163: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
++#undef TM_IN_SYS_TIME])
++m4trace:configure.in:164: -1- AC_STRUCT_TIMEZONE
++m4trace:configure.in:164: -1- AC_CHECK_MEMBERS([struct tm.tm_zone], [], [], [#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define to 1 if `tm_zone\' is member of `struct tm\'. */
++#undef HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_ZONE])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_TM_ZONE], [/* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
++   `HAVE_STRUCT_TM_TM_ZONE\' instead. */
++#undef HAVE_TM_ZONE])
++m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TZNAME])
++m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_TZNAME], [/* Define to 1 if you don\'t have `tm_zone\' but do have the external array
++   `tzname\'. */
++#undef HAVE_TZNAME])
++m4trace:configure.in:166: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:167: -1- AC_SUBST([PRE_SUBDIRS])
++m4trace:configure.in:168: -1- AC_SUBST([EXTRA_SUBDIRS])
++m4trace:configure.in:169: -1- AC_SUBST([DEPLIBS])
++m4trace:configure.in:170: -1- AC_SUBST([LOCALDEFS])
++m4trace:configure.in:171: -1- AC_FUNC_VPRINTF
++m4trace:configure.in:171: -1- AC_CHECK_FUNCS([vprintf], [
++AC_CHECK_FUNC(_doprnt,
++	       [AC_DEFINE(HAVE_DOPRNT, 1,
++			  [Define to 1 if you don't have `vprintf' but do have
++			  `_doprnt.'])])])
++m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_VPRINTF], [/* Define to 1 if you have the `vprintf\' function. */
++#undef HAVE_VPRINTF])
++m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DOPRNT])
++m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DOPRNT], [/* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
++#undef HAVE_DOPRNT])
++m4trace:configure.in:204: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
++configure.in:204: the top level])
++m4trace:configure.in:204: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
++configure.in:204: the top level])
++m4trace:configure.in:208: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++configure.in:208: the top level])
++m4trace:configure.in:217: -1- AC_SUBST([BDB_INC])
++m4trace:configure.in:218: -1- AC_SUBST([BDB_LIB])
++m4trace:configure.in:224: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BDB])
++m4trace:configure.in:224: -1- AH_OUTPUT([HAVE_BDB], [/* Build in Berkeley DB support? */
++#undef HAVE_BDB])
++m4trace:configure.in:229: -1- AC_SUBST([CYRUSDB_OBJS])
++m4trace:configure.in:241: -1- AC_SUBST([SIEVE_OBJS])
++m4trace:configure.in:243: -1- AC_SUBST([SIEVE_LIBS])
++m4trace:configure.in:245: -1- AC_SUBST([SIEVE_CPPFLAGS])
++m4trace:configure.in:246: -1- AC_DEFINE_TRACE_LITERAL([USE_SIEVE])
++m4trace:configure.in:246: -1- AH_OUTPUT([USE_SIEVE], [/* Build in Sieve support? */
++#undef USE_SIEVE])
++m4trace:configure.in:249: -1- AC_PROG_YACC
++m4trace:configure.in:249: -1- AC_SUBST([YACC])
++m4trace:configure.in:250: -1- AC_PROG_LEX
++m4trace:configure.in:250: -1- AC_SUBST([LEX])
++m4trace:configure.in:250: -1- AC_CHECK_LIB([fl], [yywrap], [LEXLIB="-lfl"], [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
++m4trace:configure.in:250: -1- AC_CHECK_LIB([l], [yywrap], [LEXLIB="-ll"])
++m4trace:configure.in:250: -1- AC_SUBST([LEXLIB])
++m4trace:configure.in:250: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
++m4trace:configure.in:250: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
++m4trace:configure.in:250: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
++   `char[]\'. */
++#undef YYTEXT_POINTER])
++m4trace:configure.in:251: -1- AC_CHECK_LIB([fl], [main])
++m4trace:configure.in:251: -1- AH_OUTPUT([HAVE_LIBFL], [/* Define to 1 if you have the `fl\' library (-lfl). */
++#undef HAVE_LIBFL])
++m4trace:configure.in:251: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFL])
++m4trace:configure.in:255: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_REGEX])
++m4trace:configure.in:255: -1- AH_OUTPUT([ENABLE_REGEX], [/* Do we have a decent regex library? */
++#undef ENABLE_REGEX])
++m4trace:configure.in:255: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RX])
++m4trace:configure.in:255: -2- AH_OUTPUT([HAVE_RX], [/* Do we have rxposix.h? */
++#undef HAVE_RX])
++m4trace:configure.in:262: -1- AC_SUBST([SIEVE_SUBDIRS])
++m4trace:configure.in:265: -2- AC_DEFINE_TRACE_LITERAL([HAS_STRERROR])
++m4trace:configure.in:265: -2- AH_OUTPUT([HAS_STRERROR], [/* Do we have strerror()? */
++#undef HAS_STRERROR])
++m4trace:configure.in:266: -2- AC_DEFINE_TRACE_LITERAL([NEED_SYS_ERRLIST])
++m4trace:configure.in:266: -2- AH_OUTPUT([NEED_SYS_ERRLIST], [/* Do we have a sys_errlist? */
++#undef NEED_SYS_ERRLIST])
++m4trace:configure.in:266: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
++You should run autoupdate.], [autoconf/functions.m4:111: AC_FUNC_CHECK is expanded from...
++configure.in:266: the top level])
++m4trace:configure.in:269: -1- AC_CHECK_HEADERS([sys/resource.h])
++m4trace:configure.in:269: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
++#undef HAVE_SYS_RESOURCE_H])
++m4trace:configure.in:270: -1- AC_CHECK_FUNCS([setrlimit])
++m4trace:configure.in:270: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define to 1 if you have the `setrlimit\' function. */
++#undef HAVE_SETRLIMIT])
++m4trace:configure.in:271: -1- AC_CHECK_FUNCS([getrlimit])
++m4trace:configure.in:271: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
++#undef HAVE_GETRLIMIT])
++m4trace:configure.in:274: -1- AC_CHECK_FUNCS([daemon setsid])
++m4trace:configure.in:274: -1- AH_OUTPUT([HAVE_DAEMON], [/* Define to 1 if you have the `daemon\' function. */
++#undef HAVE_DAEMON])
++m4trace:configure.in:274: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
++#undef HAVE_SETSID])
++m4trace:configure.in:277: -1- AC_CHECK_FUNCS([shutdown])
++m4trace:configure.in:277: -1- AH_OUTPUT([HAVE_SHUTDOWN], [/* Define to 1 if you have the `shutdown\' function. */
++#undef HAVE_SHUTDOWN])
++m4trace:configure.in:279: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKLEN_T])
++m4trace:configure.in:279: -2- AH_OUTPUT([HAVE_SOCKLEN_T], [/* Do we have a socklen_t? */
++#undef HAVE_SOCKLEN_T])
++m4trace:configure.in:281: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:281: -2- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_STORAGE], [/* Do we have a sockaddr_storage? */
++#undef HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:282: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RLIM_T])
++m4trace:configure.in:282: -2- AH_OUTPUT([HAVE_RLIM_T], [/* Do we have an rlim_t? */
++#undef HAVE_RLIM_T])
++m4trace:configure.in:290: -1- AC_CHECK_LIB([util], [setproctitle], [spt_type=SPT_BUILTIN
++			LIBS="${LIBS} -lutil"])
++m4trace:configure.in:305: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:305: the top level])
++m4trace:configure.in:316: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:316: the top level])
++m4trace:configure.in:327: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:327: the top level])
++m4trace:configure.in:334: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
++m4trace:configure.in:334: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
++#undef SPT_TYPE])
++m4trace:configure.in:344: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++configure.in:344: the top level])
++m4trace:configure.in:346: -1- AC_SUBST([WITH_NONBLOCK])
++m4trace:configure.in:353: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++configure.in:353: the top level])
++m4trace:configure.in:355: -1- AC_SUBST([WITH_GMTOFF])
++m4trace:configure.in:383: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++configure.in:383: the top level])
++m4trace:configure.in:415: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++configure.in:415: the top level])
++m4trace:configure.in:426: -1- AC_SUBST([WITH_MAP])
++m4trace:configure.in:435: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
++autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++configure.in:435: the top level])
++m4trace:configure.in:437: -1- AC_SUBST([WITH_LOCK])
++m4trace:configure.in:441: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:441: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++#undef HAVE_FDATASYNC])
++m4trace:configure.in:446: -1- AC_CHECK_LIB([rt], [fdatasync], [
++	LIB_RT="-lrt"
++	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
++  ])
++m4trace:configure.in:446: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:446: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++#undef HAVE_FDATASYNC])
++m4trace:configure.in:467: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
++    dnl not hp flavor
++    SAVE_LDFLAGS="$LDFLAGS"
++    dnl solaris flavor
++    LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
++    AC_CHECK_LIB(ucb, sigvec, [
++      dnl more solaris flavor
++      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
++      [ cant_find_sigvec=yes ])
++    LDFLAGS="$SAVE_LDFLAGS"])
++m4trace:configure.in:467: -1- AC_CHECK_LIB([ucb], [sigvec], [
++      dnl more solaris flavor
++      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"], [ cant_find_sigvec=yes ])
++m4trace:configure.in:468: -1- AC_SUBST([cyrus_sigveclib])
++m4trace:configure.in:482: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
++m4trace:configure.in:482: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
++#undef AFSPTS_USE_KRB5])
++m4trace:configure.in:515: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++configure.in:515: the top level])
++m4trace:configure.in:521: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:522: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:523: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:523: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++#undef HAVE_AFSKRB])
++m4trace:configure.in:527: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:528: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:529: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:529: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++#undef HAVE_AFSKRB])
++m4trace:configure.in:557: -1- AC_CHECK_LIB([ldap], [ldap_initialize], [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
++          AC_SUBST(LDAP_CPPFLAGS)
++          AC_SUBST(LDAP_LDFLAGS)
++          AC_SUBST(LDAP_LIBS)	
++          LDAP_LIBS="-lldap -llber" ], [], [-llber])
++m4trace:configure.in:557: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
++m4trace:configure.in:557: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
++#undef HAVE_LDAP])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_CPPFLAGS])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_LDFLAGS])
++m4trace:configure.in:557: -1- AC_SUBST([LDAP_LIBS])
++m4trace:configure.in:566: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
++m4trace:configure.in:566: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
++#undef WITH_PTS])
++m4trace:configure.in:575: -1- AC_SUBST([SERVER_SUBDIRS])
++m4trace:configure.in:593: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:593: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++#undef HAVE_LIBRESOLV])
++m4trace:configure.in:593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:610: -1- AC_CHECK_LIB([des], [des_ecb_encrypt], [if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$with_krb/lib/libdes.a"
++      else
++          KRB_LIBS="-ldes"
++      fi], [{ { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
++echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
++   { (exit 1); exit 1; }; }])
++m4trace:configure.in:647: -3- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:647: the top level])
++m4trace:configure.in:648: -2- AC_CHECK_LIB([${KRBLIB}], [krb_mk_priv], [if test "$with_statickrb" = "yes"; then
++          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
++      else
++          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
++      fi], [{ echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
++echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no], [$KRB_LIBS])
++m4trace:configure.in:649: -2- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:649: the top level])
++m4trace:configure.in:651: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++configure.in:651: the top level])
++m4trace:configure.in:656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
++m4trace:configure.in:656: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
++#undef HAVE_KRB])
++m4trace:configure.in:680: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
++m4trace:configure.in:685: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
++m4trace:configure.in:687: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
++m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
++m4trace:configure.in:703: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
++#undef HAVE_SSL])
++m4trace:configure.in:706: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
++m4trace:configure.in:706: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
++#undef OPENSSL_ENABLE_OLD_DES_SUPPORT])
++m4trace:configure.in:707: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
++m4trace:configure.in:707: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
++#undef OPENSSL_DES_LIBDES_COMPATIBILITY])
++m4trace:configure.in:710: -1- AC_SUBST([OPENSSL_INC])
++m4trace:configure.in:711: -1- AC_SUBST([OPENSSL_LIB])
++m4trace:configure.in:722: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
++m4trace:configure.in:722: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
++#undef EGD_SOCKET])
++m4trace:configure.in:742: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
++m4trace:configure.in:750: -1- AC_SUBST([ZEPHYR_LIBS])
++m4trace:configure.in:751: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
++m4trace:configure.in:753: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
++m4trace:configure.in:753: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
++#undef HAVE_ZEPHYR])
++m4trace:configure.in:763: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
++m4trace:configure.in:763: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
++#undef MASTER_PIDFILE])
++m4trace:configure.in:771: -1- AC_SUBST([WITH_IDLE])
++m4trace:configure.in:796: -1- AC_SUBST([IMAP_PROGS])
++m4trace:configure.in:828: -1- AC_CHECK_LIB([com_err], [com_err], [
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		AC_CHECK_HEADER(et/com_err.h,
++		  [AC_DEFINE(HAVE_ET_COM_ERR_H,[],[We need et/com_err.h])],
++		  [AC_CHECK_HEADER(com_err.h,[],[AC_ERROR([cannot locate com_err.h])])])
++		AC_PATH_PROG(COMPILE_ET, compile_et, [no compile et])
++	], [
++	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
++		with_com_err="/usr/local"
++		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, [no compile et])
++	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
++		with_com_err="/usr"
++		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, [no compile et])
++	else
++		# use ours
++		with_com_err=yes
++	fi
++	])
++m4trace:configure.in:828: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
++m4trace:configure.in:828: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
++#undef HAVE_ET_COM_ERR_H])
++m4trace:configure.in:828: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/libs.m4:134: AC_CHECK_LIB is expanded from...
++configure.in:828: the top level])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:869: -1- AC_SUBST([COMPILE_ET])
++m4trace:configure.in:870: -1- AC_SUBST([COM_ERR_LIBS])
++m4trace:configure.in:871: -1- AC_SUBST([COM_ERR_LDFLAGS])
++m4trace:configure.in:872: -1- AC_SUBST([COM_ERR_CPPFLAGS])
++m4trace:configure.in:878: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++configure.in:878: the top level])
++m4trace:configure.in:893: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
++m4trace:configure.in:893: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
++#undef SYSLOG_FACILITY])
++m4trace:configure.in:897: -1- AC_LIBSOURCE([getdtablesize.c])
++m4trace:configure.in:897: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
++m4trace:configure.in:897: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
++#undef HAVE_GETDTABLESIZE])
++m4trace:configure.in:897: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:910: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
++m4trace:configure.in:910: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
++#undef OLD_SIEVE_SERVICE_NAME])
++m4trace:configure.in:919: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
++m4trace:configure.in:919: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
++#undef ENABLE_LISTEXT])
++m4trace:configure.in:926: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
++m4trace:configure.in:926: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
++#undef ENABLE_X_NETSCAPE_HACK])
++m4trace:configure.in:929: -1- AC_CHECK_LIB([dl], [dlopen])
++m4trace:configure.in:929: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
++#undef HAVE_LIBDL])
++m4trace:configure.in:929: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_CRYPT])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
++#undef HAVE_GSSAPI_H])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++#undef HAVE_LIBRESOLV])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gssapi], [gss_unwrap], [gss_impl="heimdal"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET}])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gssapi_krb5], [gss_unwrap], [gss_impl="mit"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET}])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe03"], [unset ac_cv_lib_gss_csf_gss_acq_user;
++                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
++                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)], [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
++autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
++cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
++configure.in:930: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
++m4trace:configure.in:930: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
++m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [/* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
++   */
++#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
++m4trace:configure.in:930: -1- AC_SUBST([GSSAPI_LIBS])
++m4trace:configure.in:930: -1- AC_SUBST([GSSAPIBASE_LIBS])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
++configure.in:930: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_DYN_SASL])
++m4trace:configure.in:930: -1- AC_SUBST([DYNSASLFLAGS])
++m4trace:configure.in:930: -1- AC_SUBST([LIB_SASL])
++m4trace:configure.in:930: -1- AC_SUBST([SASLFLAGS])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
++configure.in:930: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
++autoconf/general.m4:2087: _AC_PREPROC_IFELSE is expanded from...
++autoconf/general.m4:2097: AC_PREPROC_IFELSE is expanded from...
++autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:930: the top level])
++m4trace:configure.in:931: -1- AC_CHECK_LIB([sasl2], [sasl_checkapop], [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])], [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
++m4trace:configure.in:931: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
++m4trace:configure.in:931: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
++#undef HAVE_APOP])
++m4trace:configure.in:944: -1- AC_SUBST([PERL])
++m4trace:configure.in:960: -1- AC_SUBST([PERL_CCCDLFLAGS])
++m4trace:configure.in:978: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
++m4trace:configure.in:978: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
++You should run autoupdate.], [autoconf/functions.m4:111: AC_FUNC_CHECK is expanded from...
++configure.in:978: the top level])
++m4trace:configure.in:979: -1- AC_SUBST([MD5OBJ])
++m4trace:configure.in:984: -1- AC_SUBST([SNMP_SUBDIRS])
++m4trace:configure.in:986: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++cmulocal/common.m4:61: CMU_FIND_LIB_SUBDIR is expanded from...
++configure.in:986: CMU_FIND_LIB_SUBDIR is required by...
++cmulocal/libwrap.m4:30: CMU_LIBWRAP is expanded from...
++configure.in:986: the top level])
++m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
++m4trace:configure.in:986: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
++#undef SIZEOF_LONG])
++m4trace:configure.in:986: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
++m4trace:configure.in:986: -1- AC_CHECK_LIB([wrap], [request_init], [
++		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], [with_libwrap=no], [${LIB_SOCKET}])
++m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
++m4trace:configure.in:986: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
++#undef HAVE_LIBWRAP])
++m4trace:configure.in:986: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
++m4trace:configure.in:986: -1- AC_SUBST([LIB_WRAP])
++m4trace:configure.in:987: -1- AC_SUBST([SNMP_CONFIG], [$ac_cv_path_SNMP_CONFIG])
++m4trace:configure.in:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
++m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
++#undef HAVE_NETSNMP])
++m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:987: -1- AC_CHECK_LIB([snmp], [sprint_objid], [
++  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)], [with_snmp=no], [${LIB_SOCKET}])
++m4trace:configure.in:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
++m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
++#undef HAVE_UCDSNMP])
++m4trace:configure.in:987: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
++m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:1022: -1- AC_SUBST([LIB_RT])
++m4trace:configure.in:1023: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
++m4trace:configure.in:1024: -1- AC_SUBST([IMAP_LIBS])
++m4trace:configure.in:1032: -1- AC_SUBST([PERL_SUBDIRS])
++m4trace:configure.in:1033: -1- AC_SUBST([PERL_DEPSUBDIRS])
++m4trace:configure.in:1034: -1- AC_SUBST([PERL])
++m4trace:configure.in:1080: -1- AH_OUTPUT([00001], [
++/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef _CYRUS_IMAPD_CONFIG_H_
++#define _CYRUS_IMAPD_CONFIG_H_
++])
++m4trace:configure.in:1229: -1- AH_OUTPUT([zzzz2], [
++/* time.h */
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++/* com_err.h, as needed */
++#ifndef IN_COM_ERR
++#ifdef HAVE_ET_COM_ERR_H
++#include <et/com_err.h>
++#else
++#include <com_err.h>
++#endif /* HAVE_ET_COM_ERR_H */
++#endif /* IN_COM_ERR */
++
++/* This allows us to work even when we don\'t have an fdatasync */
++#ifndef HAVE_FDATASYNC
++#define fdatasync(fd) fsync(fd)
++#endif
++
++/* A similar setup for not having O_DSYNC */
++#include <fcntl.h>
++
++#ifndef O_DSYNC
++#  ifdef O_SYNC
++#    define O_DSYNC     O_SYNC          /* POSIX */
++#  else
++#    define O_DSYNC     O_FSYNC         /* BSD */
++#  endif
++#endif
++
++#ifndef HAVE___ATTRIBUTE__
++/* Can\'t use attributes... */
++#define __attribute__(foo)
++#endif
++
++#ifndef HAVE_SOCKLEN_T
++typedef unsigned int socklen_t;
++#endif
++
++#ifndef HAVE_RLIM_T
++typedef int rlim_t;
++#endif
++
++/* some potentially memory saving tradeoffs, 
++   preconfigured in memory-saving mode */
++
++/* save the cmdlines for the ID command */
++#undef ID_SAVE_CMDLINE
++
++/* IPv6 things */
++#include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
++#define	_SS_MAXSIZE	128	/* Implementation specific max size */
++#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
++
++struct sockaddr_storage {
++	struct	sockaddr ss_sa;
++	char		__ss_pad2[_SS_PADSIZE];
++};
++# define ss_family ss_sa.sa_family
++# define HAVE_SS_FAMILY
++#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
++
++#ifndef HAVE_SS_FAMILY
++#define ss_family	__ss_family
++#endif
++
++#ifndef AF_INET6
++/* Define it to something that should never appear */
++#define	AF_INET6	AF_MAX
++#endif
++
++#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
++#include "gai.h"
++#endif
++
++/* End IPv6 things */
++
++#ifdef OLD_SIEVE_SERVICE_NAME
++#define SIEVE_SERVICE_NAME "imap"
++#else
++#define SIEVE_SERVICE_NAME "sieve"
++#endif
++
++/* filenames */
++#define FNAME_DBDIR "/db"
++#define FNAME_USERDIR "/user/"
++#define FNAME_DOMAINDIR "/domain/"
++#define FNAME_LOGDIR "/log/"
++#define FNAME_PTSDB "/ptclient/ptscache.db"
++#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
++#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
++
++#ifndef HAVE_SHUTDOWN
++#define shutdown(fd, mode) 0
++#endif
++
++/* compile time options; think carefully before modifying */
++enum {
++    /* should we send an UNAVAILABLE message to master when
++     * a service is exiting (master is already going to be 
++     * informed of the exit by the SIGCHLD signal anyway) ? */
++    MESSAGE_MASTER_ON_EXIT = 0,
++
++    /* should a hierarchical rename stop on error? */
++    RENAME_STOP_ON_ERROR = 1,
++
++    /* should we call fsync() to maybe help with softupdates? (it should) */
++    APPEND_ULTRA_PARANOID = 1,
++
++    /* should we log extra information at the DEBUG level for DB stuff? 
++     * 0 -> nothing; 1 -> some; higher -> even more */
++    CONFIG_DB_VERBOSE = 1,
++
++    /* log timing information to LOG_DEBUG */
++    CONFIG_TIMING_VERBOSE = 0,
++
++    /* should we be pedantic about namespace or sleezy? */
++    SLEEZY_NAMESPACE = 1,
++
++    /* should we do a fast TLS session shutdown? */
++    TLS_FAST_SHUTDOWN = 1,
++
++    /* should we use the SQUAT engine to accelerate SEARCH? */
++    SQUAT_ENGINE = 1,
++
++    /* should we have long LMTP error messages? */
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
++};
++
++#endif /* _CYRUS_IMAPD_CONFIG_H_ */
++])
++m4trace:configure.in:1232: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
++m4trace:configure.in:1232: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
++You should run autoupdate.], [])
++m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess
+--- cyrus-imapd-2.2.13/config.guess	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess	2006-05-19 15:21:36.444311811 +0200
+@@ -0,0 +1,1465 @@
++#! /bin/sh
++# Attempt to guess a canonical system name.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++timestamp='2005-04-22'
++
++# 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
++# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
++#
++# This script attempts to guess a canonical system name similar to
++# config.sub.  If it succeeds, it prints the system name on stdout, and
++# exits with 0.  Otherwise, it exits with 1.
++#
++# The plan is that this can be called by configure scripts if you
++# don't specify an explicit build system type.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
++fi
++
++trap 'exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
++
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac ;'
++
++# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
++# (ghazi@noc.rutgers.edu 1994-08-24)
++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
++	PATH=$PATH:/.attbin ; export PATH
++fi
++
++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++
++# Note: order is significant - the case branches are not exclusive.
++
++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# NetBSD (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	#
++	# Note: NetBSD doesn't particularly care about the vendor
++	# portion of the name.  We always set it to "unknown".
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
++	    arm*) machine=arm-unknown ;;
++	    sh3el) machine=shl-unknown ;;
++	    sh3eb) machine=sh-unknown ;;
++	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE_ARCH}" in
++	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# 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 ;;
++    *:OpenBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:MirBSD:*:*)
++	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    alpha:OSF1:*:*)
++	case $UNAME_RELEASE in
++	*4.0)
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
++	# A Vn.n version is a released version.
++	# A Tn.n version is a released field test version.
++	# 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 ;;
++    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 ;;
++    21064:Windows_NT:50:3)
++	echo alpha-dec-winnt3.5
++	exit 0 ;;
++    Amiga*:UNIX_System_V:4.0:*)
++	echo m68k-unknown-sysv4
++	exit 0;;
++    *:[Aa]miga[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-amigaos
++	exit 0 ;;
++    *:[Mm]orph[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-morphos
++	exit 0 ;;
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
++	exit 0 ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit 0 ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit 0 ;;
++    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
++	echo arm-acorn-riscix${UNAME_RELEASE}
++	exit 0;;
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++	echo hppa1.1-hitachi-hiuxmpp
++	exit 0;;
++    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
++		echo pyramid-pyramid-sysv3
++	else
++		echo pyramid-pyramid-bsd
++	fi
++	exit 0 ;;
++    NILE*:*:*:dcosx)
++	echo pyramid-pyramid-svr4
++	exit 0 ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit 0 ;;
++    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 ;;
++	esac ;;
++    sun4H:SunOS:5.*:*)
++	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
++    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
++	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
++    i86pc:SunOS:5.*:*)
++	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
++    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 ;;
++    sun4*:SunOS:*:*)
++	case "`/usr/bin/arch -k`" in
++	    Series*|S4*)
++		UNAME_RELEASE=`uname -v`
++		;;
++	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 ;;
++    sun3*:SunOS:*:*)
++	echo m68k-sun-sunos${UNAME_RELEASE}
++	exit 0 ;;
++    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
++	case "`/bin/arch`" in
++	    sun3)
++		echo m68k-sun-sunos${UNAME_RELEASE}
++		;;
++	    sun4)
++		echo sparc-sun-sunos${UNAME_RELEASE}
++		;;
++	esac
++	exit 0 ;;
++    aushp:SunOS:*:*)
++	echo sparc-auspex-sunos${UNAME_RELEASE}
++	exit 0 ;;
++    # 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
++    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
++    # to the lowercase version "mint" (or "freemint").  Finally
++    # the system name "TOS" denotes a system which is actually not
++    # MiNT.  But MiNT is downward compatible to TOS, so this should
++    # be no problem.
++    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit 0 ;;
++    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++	echo m68k-atari-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit 0 ;;
++    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++        echo m68k-milan-mint${UNAME_RELEASE}
++        exit 0 ;;
++    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++        echo m68k-hades-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++        echo m68k-unknown-mint${UNAME_RELEASE}
++        exit 0 ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit 0 ;;
++    powerpc:machten:*:*)
++	echo powerpc-apple-machten${UNAME_RELEASE}
++	exit 0 ;;
++    RISC*:Mach:*:*)
++	echo mips-dec-mach_bsd4.3
++	exit 0 ;;
++    RISC*:ULTRIX:*:*)
++	echo mips-dec-ultrix${UNAME_RELEASE}
++	exit 0 ;;
++    VAX*:ULTRIX*:*:*)
++	echo vax-dec-ultrix${UNAME_RELEASE}
++	exit 0 ;;
++    2020:CLIX:*:* | 2430:CLIX:*:*)
++	echo clipper-intergraph-clix${UNAME_RELEASE}
++	exit 0 ;;
++    mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
++	#if defined (host_mips) && defined (MIPSEB)
++	#if defined (SYSTYPE_SYSV)
++	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_SVR4)
++	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
++	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	#endif
++	#endif
++	  exit (-1);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c \
++	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && exit 0
++	echo mips-mips-riscos${UNAME_RELEASE}
++	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:Power_UNIX:*:*)
++	echo powerpc-harris-powerunix
++	exit 0 ;;
++    m88k:CX/UX:7*:*)
++	echo m88k-harris-cxux7
++	exit 0 ;;
++    m88k:*:4*:R4*)
++	echo m88k-motorola-sysv4
++	exit 0 ;;
++    m88k:*:3*:R3*)
++	echo m88k-motorola-sysv3
++	exit 0 ;;
++    AViiON:dgux:*:*)
++        # DG/UX returns AViiON for all architectures
++        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
++		echo m88k-dg-dgux${UNAME_RELEASE}
++	    else
++		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
++	fi
++ 	exit 0 ;;
++    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
++	echo m88k-dolphin-sysv3
++	exit 0 ;;
++    M88*:*:R3*:*)
++	# Delta 88k system running SVR3
++	echo m88k-motorola-sysv3
++	exit 0 ;;
++    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
++	echo m88k-tektronix-sysv3
++	exit 0 ;;
++    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
++	echo m68k-tektronix-bsd
++	exit 0 ;;
++    *:IRIX*:*:*)
++	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	exit 0 ;;
++    ????????: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 '
++    i*86:AIX:*:*)
++	echo i386-ibm-aix
++	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
++    *:AIX:2:3)
++	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
++		sed 's/^		//' << EOF >$dummy.c
++		#include <sys/systemcfg.h>
++
++		main()
++			{
++			if (!__power_pc())
++				exit(1);
++			puts("powerpc-ibm-aix3.2.5");
++			exit(0);
++			}
++EOF
++		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++		echo rs6000-ibm-aix3.2.5
++	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 ;;
++    *: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
++		IBM_ARCH=rs6000
++	else
++		IBM_ARCH=powerpc
++	fi
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	exit 0 ;;
++    *:AIX:*:*)
++	echo rs6000-ibm-aix
++	exit 0 ;;
++    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++	echo romp-ibm-bsd4.4
++	exit 0 ;;
++    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
++    *:BOSX:*:*)
++	echo rs6000-bull-bosx
++	exit 0 ;;
++    DPX/2?00:B.O.S.:*:*)
++	echo m68k-bull-sysv3
++	exit 0 ;;
++    9000/[34]??:4.3bsd:1.*:*)
++	echo m68k-hp-bsd
++	exit 0 ;;
++    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
++	echo m68k-hp-bsd4.4
++	exit 0 ;;
++    9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	case "${UNAME_MACHINE}" in
++	    9000/31? )            HP_ARCH=m68000 ;;
++	    9000/[34]?? )         HP_ARCH=m68k ;;
++	    9000/[678][0-9][0-9])
++		if [ -x /usr/bin/getconf ]; then
++		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                        esac ;;
++                    esac
++		fi
++		if [ "${HP_ARCH}" = "" ]; then
++		    eval $set_cc_for_build
++		    sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
++              #include <stdlib.h>
++              #include <unistd.h>
++
++              int main ()
++              {
++              #if defined(_SC_KERNEL_BITS)
++                  long bits = sysconf(_SC_KERNEL_BITS);
++              #endif
++                  long cpu  = sysconf (_SC_CPU_VERSION);
++
++                  switch (cpu)
++              	{
++              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++              	case CPU_PA_RISC2_0:
++              #if defined(_SC_KERNEL_BITS)
++              	    switch (bits)
++              		{
++              		case 64: puts ("hppa2.0w"); break;
++              		case 32: puts ("hppa2.0n"); break;
++              		default: puts ("hppa2.0"); break;
++              		} break;
++              #else  /* !defined(_SC_KERNEL_BITS) */
++              	    puts ("hppa2.0"); break;
++              #endif
++              	default: puts ("hppa1.0"); break;
++              	}
++                  exit (0);
++              }
++EOF
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
++		fi ;;
++	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
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
++	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
++    3050*:HI-UX:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <unistd.h>
++	int
++	main ()
++	{
++	  long cpu = sysconf (_SC_CPU_VERSION);
++	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
++	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
++	     results, however.  */
++	  if (CPU_IS_PA_RISC (cpu))
++	    {
++	      switch (cpu)
++		{
++		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
++		  default: puts ("hppa-hitachi-hiuxwe2"); break;
++		}
++	    }
++	  else if (CPU_IS_HP_MC68K (cpu))
++	    puts ("m68k-hitachi-hiuxwe2");
++	  else puts ("unknown-hitachi-hiuxwe2");
++	  exit (0);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	echo unknown-hitachi-hiuxwe2
++	exit 0 ;;
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++	echo hppa1.1-hp-bsd
++	exit 0 ;;
++    9000/8??:4.3bsd:*:*)
++	echo hppa1.0-hp-bsd
++	exit 0 ;;
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
++	echo hppa1.0-hp-mpeix
++	exit 0 ;;
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++	echo hppa1.1-hp-osf
++	exit 0 ;;
++    hp8??:OSF1:*:*)
++	echo hppa1.0-hp-osf
++	exit 0 ;;
++    i*86:OSF1:*:*)
++	if [ -x /usr/sbin/sysversion ] ; then
++	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	else
++	    echo ${UNAME_MACHINE}-unknown-osf1
++	fi
++	exit 0 ;;
++    parisc*:Lites*:*:*)
++	echo hppa1.1-hp-lites
++	exit 0 ;;
++    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
++	echo c1-convex-bsd
++        exit 0 ;;
++    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++        exit 0 ;;
++    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
++	echo c34-convex-bsd
++        exit 0 ;;
++    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
++	echo c38-convex-bsd
++        exit 0 ;;
++    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
++	echo c4-convex-bsd
++        exit 0 ;;
++    CRAY*Y-MP:*:*:*)
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    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 ;;
++    CRAY*TS:*:*:*)
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    *:UNICOS/mp:*:*)
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    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 ;;
++    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 ;;
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++	exit 0 ;;
++    sparc*:BSD/OS:*:*)
++	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	exit 0 ;;
++    *:BSD/OS:*:*)
++	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	exit 0 ;;
++    *:FreeBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
++    i*:CYGWIN*:*)
++	echo ${UNAME_MACHINE}-pc-cygwin
++	exit 0 ;;
++    i*:MINGW*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
++    x86:Interix*:[34]*)
++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++	exit 0 ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
++	exit 0 ;;
++    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 ;;
++    i*:UWIN*:*)
++	echo ${UNAME_MACHINE}-pc-uwin
++	exit 0 ;;
++    amd64:CYGWIN*:*:*)
++	echo x86_64-unknown-cygwin
++	exit 0 ;;
++    p*:CYGWIN*:*)
++	echo powerpcle-unknown-cygwin
++	exit 0 ;;
++    prep*:SunOS:5.*:*)
++	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
++    *:GNU:*:*)
++	# the GNU system
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	exit 0 ;;
++    *: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 ;;
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit 0 ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit 0 ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips
++	#undef mipsel
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips
++	#else
++	CPU=
++	#endif
++	#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
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#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
++	;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit 0 ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit 0 ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	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 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    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
++	# problems with other programs or directories called `ld' in the path.
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
++				    s/[ 	][ 	]*/ /g
++				    s/.*supported targets: *//
++				    s/ .*//
++				    p'`
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  a.out-i386-linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit 0 ;;
++	  coff-i386)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit 0 ;;
++	  "")
++		# 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 ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#ifdef __ELF__
++	# ifdef __GLIBC__
++	#  if __GLIBC__ >= 2
++	LIBC=gnu
++	#  else
++	LIBC=gnulibc1
++	#  endif
++	# else
++	LIBC=gnulibc1
++	# endif
++	#else
++	#ifdef __INTEL_COMPILER
++	LIBC=gnu
++	#else
++	LIBC=gnuaout
++	#endif
++	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#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
++	;;
++    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 ;;
++    i*86:UNIX_SV:4.2MP:2.*)
++        # Unixware is an offshoot of SVR4, but it has its own version
++        # number series starting with 2...
++        # I am not positive that other SVR4 systems won't match this,
++	# I just have to hope.  -- rms.
++        # Use sysv4.2uw... so that sysv4* matches it.
++	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	exit 0 ;;
++    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 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit 0 ;;
++	i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
++    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
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++	else
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++	fi
++	exit 0 ;;
++    i*86:*:5:[78]*)
++	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 ;;
++    i*86:*:3.2:*)
++	if test -f /usr/options/cb.name; then
++		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
++		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++	elif /bin/uname -X 2>/dev/null >/dev/null ; then
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
++			&& UNAME_MACHINE=i586
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++	else
++		echo ${UNAME_MACHINE}-pc-sysv32
++	fi
++	exit 0 ;;
++    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 ;;
++    Intel:Mach:3*:*)
++	echo i386-pc-mach3
++	exit 0 ;;
++    paragon:*:*:*)
++	echo i860-intel-osf1
++	exit 0 ;;
++    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 ;;
++    mini*:CTIX:SYS*5:*)
++	# "miniframe"
++	echo m68010-convergent-sysv
++	exit 0 ;;
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit 0 ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit 0 ;;
++    M68*:*:R3V[5678]*:*)
++	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
++    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
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
++        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++          && echo i486-ncr-sysv4 && exit 0 ;;
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
++	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    mc68030:UNIX_System_V:4.*:*)
++	echo m68k-atari-sysv4
++	exit 0 ;;
++    TSUNAMI:LynxOS:2.*:*)
++	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    rs6000:LynxOS:2.*:*)
++	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    SM[BE]S:UNIX_SV:*:*)
++	echo mips-dde-sysv${UNAME_RELEASE}
++	exit 0 ;;
++    RM*:ReliantUNIX-*:*:*)
++	echo mips-sni-sysv4
++	exit 0 ;;
++    RM*:SINIX-*:*:*)
++	echo mips-sni-sysv4
++	exit 0 ;;
++    *:SINIX-*:*:*)
++	if uname -p 2>/dev/null >/dev/null ; then
++		UNAME_MACHINE=`(uname -p) 2>/dev/null`
++		echo ${UNAME_MACHINE}-sni-sysv4
++	else
++		echo ns32k-sni-sysv
++	fi
++	exit 0 ;;
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
++        echo i586-unisys-sysv4
++        exit 0 ;;
++    *: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 ;;
++    *:*:*:FTX*)
++	# From seanf@swdc.stratus.com.
++	echo i860-stratus-sysv4
++	exit 0 ;;
++    i*86:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo ${UNAME_MACHINE}-stratus-vos
++	exit 0 ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit 0 ;;
++    mc68*:A/UX:*:*)
++	echo m68k-apple-aux${UNAME_RELEASE}
++	exit 0 ;;
++    news*:NEWS-OS:6*:*)
++	echo mips-sony-newsos6
++	exit 0 ;;
++    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 ;;
++    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++	echo powerpc-be-beos
++	exit 0 ;;
++    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
++	echo powerpc-apple-beos
++	exit 0 ;;
++    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
++	echo i586-pc-beos
++	exit 0 ;;
++    SX-4:SUPER-UX:*:*)
++	echo sx4-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    SX-5:SUPER-UX:*:*)
++	echo sx5-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    Power*:Rhapsody:*:*)
++	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Rhapsody:*:*)
++	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Darwin:*:*)
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    *86) UNAME_PROCESSOR=i686 ;;
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
++		UNAME_MACHINE=pc
++	fi
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	exit 0 ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSE-?:NONSTOP_KERNEL:*:*)
++	echo nse-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    NSR-?:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
++	exit 0 ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
++    *:*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 ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit 0 ;;
++esac
++
++#echo '(No uname command or uname output not recognized.)' 1>&2
++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
++
++eval $set_cc_for_build
++cat >$dummy.c <<EOF
++#ifdef _SEQUENT_
++# include <sys/types.h>
++# include <sys/utsname.h>
++#endif
++main ()
++{
++#if defined (sony)
++#if defined (MIPSEB)
++  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
++     I don't know....  */
++  printf ("mips-sony-bsd\n"); exit (0);
++#else
++#include <sys/param.h>
++  printf ("m68k-sony-newsos%s\n",
++#ifdef NEWSOS4
++          "4"
++#else
++	  ""
++#endif
++         ); exit (0);
++#endif
++#endif
++
++#if defined (__arm) && defined (__acorn) && defined (__unix)
++  printf ("arm-acorn-riscix"); exit (0);
++#endif
++
++#if defined (hp300) && !defined (hpux)
++  printf ("m68k-hp-bsd\n"); exit (0);
++#endif
++
++#if defined (NeXT)
++#if !defined (__ARCHITECTURE__)
++#define __ARCHITECTURE__ "m68k"
++#endif
++  int version;
++  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
++  exit (0);
++#endif
++
++#if defined (MULTIMAX) || defined (n16)
++#if defined (UMAXV)
++  printf ("ns32k-encore-sysv\n"); exit (0);
++#else
++#if defined (CMU)
++  printf ("ns32k-encore-mach\n"); exit (0);
++#else
++  printf ("ns32k-encore-bsd\n"); exit (0);
++#endif
++#endif
++#endif
++
++#if defined (__386BSD__)
++  printf ("i386-pc-bsd\n"); exit (0);
++#endif
++
++#if defined (sequent)
++#if defined (i386)
++  printf ("i386-sequent-dynix\n"); exit (0);
++#endif
++#if defined (ns32000)
++  printf ("ns32k-sequent-dynix\n"); exit (0);
++#endif
++#endif
++
++#if defined (_SEQUENT_)
++    struct utsname un;
++
++    uname(&un);
++
++    if (strncmp(un.version, "V2", 2) == 0) {
++	printf ("i386-sequent-ptx2\n"); exit (0);
++    }
++    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
++	printf ("i386-sequent-ptx1\n"); exit (0);
++    }
++    printf ("i386-sequent-ptx\n"); exit (0);
++
++#endif
++
++#if defined (vax)
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
++#endif
++
++#if defined (alliant) && defined (i860)
++  printf ("i860-alliant-bsd\n"); exit (0);
++#endif
++
++  exit (1);
++}
++EOF
++
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++
++# Apollos put the system type in the environment.
++
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++
++# Convex versions that predate uname can use getsysinfo(1)
++
++if [ -x /usr/convex/getsysinfo ]
++then
++    case `getsysinfo -f cpu_type` in
++    c1*)
++	echo c1-convex-bsd
++	exit 0 ;;
++    c2*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++	exit 0 ;;
++    c34*)
++	echo c34-convex-bsd
++	exit 0 ;;
++    c38*)
++	echo c38-convex-bsd
++	exit 0 ;;
++    c4*)
++	echo c4-convex-bsd
++	exit 0 ;;
++    esac
++fi
++
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
++
++exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -urNad cyrus-imapd-2.2.13/config.h.in /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in
+--- cyrus-imapd-2.2.13/config.h.in	2006-05-12 12:23:20.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in	2006-05-19 15:21:21.149749506 +0200
+@@ -153,8 +153,8 @@
+ /* Do we have TCP wrappers? */
+ #undef HAVE_LIBWRAP
+ 
+-/* Define to 1 if you support file names longer than 14 characters. */
+-#undef HAVE_LONG_FILE_NAMES
++/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT
+ 
+ /* Define to 1 if you have the `memmove' function. */
+ #undef HAVE_MEMMOVE
+@@ -313,6 +313,12 @@
+ /* The size of a `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
++/* The size of a `long long int', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT
++
++/* The size of a `unsigned long long int', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT
++
+ /* Do we already have setproctitle? */
+ #undef SPT_TYPE
+ 
+@@ -337,6 +343,10 @@
+ /* Build in PTS support? */
+ #undef WITH_PTS
+ 
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
++
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+    `char[]'. */
+ #undef YYTEXT_POINTER
+@@ -496,7 +506,11 @@
+     SQUAT_ENGINE = 1,
+ 
+     /* should we have long LMTP error messages? */
+-    LMTP_LONG_ERROR_MSGS = 1
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
+ };
+ 
+ #endif /* _CYRUS_IMAPD_CONFIG_H_ */
+diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub
+--- cyrus-imapd-2.2.13/config.sub	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub	2006-05-19 15:21:36.442311999 +0200
+@@ -0,0 +1,1569 @@
++#! /bin/sh
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++timestamp='2005-04-22'
++
++# This file is (in principle) common to ALL GNU software.
++# The presence of a machine in this file suggests that SOME GNU software
++# can handle that machine.  It does not imply ALL GNU software can.
++#
++# 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
++# 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., 59 Temple Place - Suite 330,
++# Boston, MA 02111-1307, 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.
++#
++# Configuration subroutine to validate and canonicalize a configuration type.
++# Supply the specified configuration type as an argument.
++# If it is invalid, we print an error message on stderr and exit with code 1.
++# Otherwise, we print the canonical config type on stdout and succeed.
++
++# This file is supposed to be the same for all GNU packages
++# and recognize all the CPU types, system types and aliases
++# that are meaningful with *any* GNU software.
++# Each package is responsible for reporting which valid configurations
++# it does not support.  The user should be able to distinguish
++# a failure to support a valid configuration from a meaningless
++# configuration.
++
++# The goal of this file is to map all the various variations of a given
++# machine specification into a single specification in the form:
++#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or in some cases, the newer four-part form:
++#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# It is wrong to echo any other type of specification.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
++esac
++
++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
++# Here we must recognize all the valid KERNEL-OS combinations.
++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++case $maybe_os in
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++    os=-$maybe_os
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    ;;
++  *)
++    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++    if [ $basic_machine != $1 ]
++    then os=`echo $1 | sed 's/.*-/-/'`
++    else os=; fi
++    ;;
++esac
++
++### Let's recognize common machines as not being operating systems so
++### that things like config.sub decstation-3100 work.  We also
++### recognize some manufacturers as not being operating systems, so we
++### can provide default operating systems below.
++case $os in
++	-sun*os*)
++		# Prevent following clause from handling this invalid input.
++		;;
++	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
++	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
++	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
++	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
++	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
++	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
++	-apple | -axis | -knuth | -cray)
++		os=
++		basic_machine=$1
++		;;
++	-sim | -cisco | -oki | -wec | -winbond)
++		os=
++		basic_machine=$1
++		;;
++	-scout)
++		;;
++	-wrs)
++		os=-vxworks
++		basic_machine=$1
++		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
++	-hiux*)
++		os=-hiuxwe2
++		;;
++	-sco5)
++		os=-sco3.2v5
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco4)
++		os=-sco3.2v4
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2.[4-9]*)
++		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2v[4-9]*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco*)
++		os=-sco3.2v2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-udk*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-isc)
++		os=-isc2.2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-clix*)
++		basic_machine=clipper-intergraph
++		;;
++	-isc*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-lynx*)
++		os=-lynxos
++		;;
++	-ptx*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++		;;
++	-windowsnt*)
++		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		;;
++	-psos*)
++		os=-psos
++		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++esac
++
++# Decode aliases for certain CPU-COMPANY combinations.
++case $basic_machine in
++	# Recognize the basic CPU types without company name.
++	# Some are omitted here because they have special meanings below.
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| am33_2.0 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| bfin \
++	| c4x | clipper \
++	| d10v | d30v | dlx | dsp16xx \
++	| fr30 | frv \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| ip2k | iq2000 \
++	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipstx39 | mipstx39el \
++	| mn10200 | mn10300 \
++	| msp430 \
++	| ns16k | ns32k \
++	| openrisc | 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 \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b \
++	| strongarm \
++	| tahoe | thumb | tic4x | tic80 | tron \
++	| v850 | v850e \
++	| we32k \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k)
++		basic_machine=$basic_machine-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++		;;
++
++	# We use `pc' rather than `unknown'
++	# because (1) that's what they normally are, and
++	# (2) the word "unknown" tends to confuse beginning users.
++	i*86 | x86_64)
++	  basic_machine=$basic_machine-pc
++	  ;;
++	# Object if more than one company name word.
++	*-*-*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++	# Recognize the basic CPU types with company name.
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| avr-* \
++	| bfin-* | bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| clipper-* | craynv-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* | iq2000-* \
++	| m32r-* | m32rle-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| mmix-* \
++	| msp430-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparclite-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tron-* \
++	| v850-* | v850e-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
++	| ymp-* \
++	| z8k-*)
++		;;
++	# Recognize the various machine names and aliases which stand
++	# for a CPU type and a company and sometimes even an OS.
++	386bsd)
++		basic_machine=i386-unknown
++		os=-bsd
++		;;
++	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
++		basic_machine=m68000-att
++		;;
++	3b*)
++		basic_machine=we32k-att
++		;;
++	a29khif)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
++	adobe68k)
++		basic_machine=m68010-adobe
++		os=-scout
++		;;
++	alliant | fx80)
++		basic_machine=fx80-alliant
++		;;
++	altos | altos3068)
++		basic_machine=m68k-altos
++		;;
++	am29k)
++		basic_machine=a29k-none
++		os=-bsd
++		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	amdahl)
++		basic_machine=580-amdahl
++		os=-sysv
++		;;
++	amiga | amiga-*)
++		basic_machine=m68k-unknown
++		;;
++	amigaos | amigados)
++		basic_machine=m68k-unknown
++		os=-amigaos
++		;;
++	amigaunix | amix)
++		basic_machine=m68k-unknown
++		os=-sysv4
++		;;
++	apollo68)
++		basic_machine=m68k-apollo
++		os=-sysv
++		;;
++	apollo68bsd)
++		basic_machine=m68k-apollo
++		os=-bsd
++		;;
++	aux)
++		basic_machine=m68k-apple
++		os=-aux
++		;;
++	balance)
++		basic_machine=ns32k-sequent
++		os=-dynix
++		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
++	convex-c1)
++		basic_machine=c1-convex
++		os=-bsd
++		;;
++	convex-c2)
++		basic_machine=c2-convex
++		os=-bsd
++		;;
++	convex-c32)
++		basic_machine=c32-convex
++		os=-bsd
++		;;
++	convex-c34)
++		basic_machine=c34-convex
++		os=-bsd
++		;;
++	convex-c38)
++		basic_machine=c38-convex
++		os=-bsd
++		;;
++	cray | j90)
++		basic_machine=j90-cray
++		os=-unicos
++		;;
++	craynv)
++		basic_machine=craynv-cray
++		os=-unicosmp
++		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
++		;;
++	crds | unos)
++		basic_machine=m68k-crds
++		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
++	da30 | da30-*)
++		basic_machine=m68k-da30
++		;;
++	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
++		basic_machine=mips-dec
++		;;
++	decsystem10* | dec10*)
++		basic_machine=pdp10-dec
++		os=-tops10
++		;;
++	decsystem20* | dec20*)
++		basic_machine=pdp10-dec
++		os=-tops20
++		;;
++	delta | 3300 | motorola-3300 | motorola-delta \
++	      | 3300-motorola | delta-motorola)
++		basic_machine=m68k-motorola
++		;;
++	delta88)
++		basic_machine=m88k-motorola
++		os=-sysv3
++		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
++	dpx20 | dpx20-*)
++		basic_machine=rs6000-bull
++		os=-bosx
++		;;
++	dpx2* | dpx2*-bull)
++		basic_machine=m68k-bull
++		os=-sysv3
++		;;
++	ebmon29k)
++		basic_machine=a29k-amd
++		os=-ebmon
++		;;
++	elxsi)
++		basic_machine=elxsi-elxsi
++		os=-bsd
++		;;
++	encore | umax | mmax)
++		basic_machine=ns32k-encore
++		;;
++	es1800 | OSE68k | ose68k | ose | OSE)
++		basic_machine=m68k-ericsson
++		os=-ose
++		;;
++	fx2800)
++		basic_machine=i860-alliant
++		;;
++	genix)
++		basic_machine=ns32k-ns
++		;;
++	gmicro)
++		basic_machine=tron-gmicro
++		os=-sysv
++		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
++	h3050r* | hiux*)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	h8300hms)
++		basic_machine=h8300-hitachi
++		os=-hms
++		;;
++	h8300xray)
++		basic_machine=h8300-hitachi
++		os=-xray
++		;;
++	h8500hms)
++		basic_machine=h8500-hitachi
++		os=-hms
++		;;
++	harris)
++		basic_machine=m88k-harris
++		os=-sysv3
++		;;
++	hp300-*)
++		basic_machine=m68k-hp
++		;;
++	hp300bsd)
++		basic_machine=m68k-hp
++		os=-bsd
++		;;
++	hp300hpux)
++		basic_machine=m68k-hp
++		os=-hpux
++		;;
++	hp3k9[0-9][0-9] | hp9[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k2[0-9][0-9] | hp9k31[0-9])
++		basic_machine=m68000-hp
++		;;
++	hp9k3[2-9][0-9])
++		basic_machine=m68k-hp
++		;;
++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k78[0-9] | hp78[0-9])
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][13679] | hp8[0-9][13679])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][0-9] | hp8[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hppa-next)
++		os=-nextstep3
++		;;
++	hppaosf)
++		basic_machine=hppa1.1-hp
++		os=-osf
++		;;
++	hppro)
++		basic_machine=hppa1.1-hp
++		os=-proelf
++		;;
++	i370-ibm* | ibm*)
++		basic_machine=i370-ibm
++		;;
++# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
++	i*86v32)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv32
++		;;
++	i*86v4*)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv4
++		;;
++	i*86v)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv
++		;;
++	i*86sol2)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-solaris2
++		;;
++	i386mach)
++		basic_machine=i386-mach
++		os=-mach
++		;;
++	i386-vsta | vsta)
++		basic_machine=i386-unknown
++		os=-vsta
++		;;
++	iris | iris4d)
++		basic_machine=mips-sgi
++		case $os in
++		    -irix*)
++			;;
++		    *)
++			os=-irix4
++			;;
++		esac
++		;;
++	isi68 | isi)
++		basic_machine=m68k-isi
++		os=-sysv
++		;;
++	m88k-omron*)
++		basic_machine=m88k-omron
++		;;
++	magnum | m3230)
++		basic_machine=mips-mips
++		os=-sysv
++		;;
++	merlin)
++		basic_machine=ns32k-utek
++		os=-sysv
++		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
++	miniframe)
++		basic_machine=m68000-convergent
++		;;
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++	mips3*-*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		;;
++	mips3*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		;;
++	monitor)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	morphos)
++		basic_machine=powerpc-unknown
++		os=-morphos
++		;;
++	msdos)
++		basic_machine=i386-pc
++		os=-msdos
++		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
++	ncr3000)
++		basic_machine=i486-ncr
++		os=-sysv4
++		;;
++	netbsd386)
++		basic_machine=i386-unknown
++		os=-netbsd
++		;;
++	netwinder)
++		basic_machine=armv4l-rebel
++		os=-linux
++		;;
++	news | news700 | news800 | news900)
++		basic_machine=m68k-sony
++		os=-newsos
++		;;
++	news1000)
++		basic_machine=m68030-sony
++		os=-newsos
++		;;
++	news-3600 | risc-news)
++		basic_machine=mips-sony
++		os=-newsos
++		;;
++	necv70)
++		basic_machine=v70-nec
++		os=-sysv
++		;;
++	next | m*-next )
++		basic_machine=m68k-next
++		case $os in
++		    -nextstep* )
++			;;
++		    -ns2*)
++		      os=-nextstep2
++			;;
++		    *)
++		      os=-nextstep3
++			;;
++		esac
++		;;
++	nh3000)
++		basic_machine=m68k-harris
++		os=-cxux
++		;;
++	nh[45]000)
++		basic_machine=m88k-harris
++		os=-cxux
++		;;
++	nindy960)
++		basic_machine=i960-intel
++		os=-nindy
++		;;
++	mon960)
++		basic_machine=i960-intel
++		os=-mon960
++		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
++	np1)
++		basic_machine=np1-gould
++		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
++	op50n-* | op60c-*)
++		basic_machine=hppa1.1-oki
++		os=-proelf
++		;;
++	or32 | or32-*)
++		basic_machine=or32-unknown
++		os=-coff
++		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
++	OSE68000 | ose68000)
++		basic_machine=m68000-ericsson
++		os=-ose
++		;;
++	os68k)
++		basic_machine=m68k-none
++		os=-os68k
++		;;
++	pa-hitachi)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	paragon)
++		basic_machine=i860-intel
++		os=-osf
++		;;
++	pbd)
++		basic_machine=sparc-tti
++		;;
++	pbb)
++		basic_machine=m68k-tti
++		;;
++	pc532 | pc532-*)
++		basic_machine=ns32k-pc532
++		;;
++	pentium | p5 | k5 | k6 | nexgen | viac3)
++		basic_machine=i586-pc
++		;;
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
++		basic_machine=i686-pc
++		;;
++	pentiumii | pentium2 | pentiumiii | pentium3)
++		basic_machine=i686-pc
++		;;
++	pentium4)
++		basic_machine=i786-pc
++		;;
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
++		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentium4-*)
++		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pn)
++		basic_machine=pn-gould
++		;;
++	power)	basic_machine=power-ibm
++		;;
++	ppc)	basic_machine=powerpc-unknown
++		;;
++	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppcle | powerpclittle | ppc-le | powerpc-little)
++		basic_machine=powerpcle-unknown
++		;;
++	ppcle-* | powerpclittle-*)
++		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64)	basic_machine=powerpc64-unknown
++		;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++		;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ps2)
++		basic_machine=i386-ibm
++		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
++	rom68k)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	rm[46]00)
++		basic_machine=mips-siemens
++		;;
++	rtpc | rtpc-*)
++		basic_machine=romp-ibm
++		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
++	sa29200)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
++	sei)
++		basic_machine=mips-sei
++		os=-seiux
++		;;
++	sequent)
++		basic_machine=i386-sequent
++		;;
++	sh)
++		basic_machine=sh-hitachi
++		os=-hms
++		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparclite-wrs | simso-wrs)
++		basic_machine=sparclite-wrs
++		os=-vxworks
++		;;
++	sps7)
++		basic_machine=m68k-bull
++		os=-sysv2
++		;;
++	spur)
++		basic_machine=spur-unknown
++		;;
++	st2000)
++		basic_machine=m68k-tandem
++		;;
++	stratus)
++		basic_machine=i860-stratus
++		os=-sysv4
++		;;
++	sun2)
++		basic_machine=m68000-sun
++		;;
++	sun2os3)
++		basic_machine=m68000-sun
++		os=-sunos3
++		;;
++	sun2os4)
++		basic_machine=m68000-sun
++		os=-sunos4
++		;;
++	sun3os3)
++		basic_machine=m68k-sun
++		os=-sunos3
++		;;
++	sun3os4)
++		basic_machine=m68k-sun
++		os=-sunos4
++		;;
++	sun4os3)
++		basic_machine=sparc-sun
++		os=-sunos3
++		;;
++	sun4os4)
++		basic_machine=sparc-sun
++		os=-sunos4
++		;;
++	sun4sol2)
++		basic_machine=sparc-sun
++		os=-solaris2
++		;;
++	sun3 | sun3-*)
++		basic_machine=m68k-sun
++		;;
++	sun4)
++		basic_machine=sparc-sun
++		;;
++	sun386 | sun386i | roadrunner)
++		basic_machine=i386-sun
++		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
++	symmetry)
++		basic_machine=i386-sequent
++		os=-dynix
++		;;
++	t3e)
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
++		os=-unicos
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
++	tic55x | c55x*)
++		basic_machine=tic55x-unknown
++		os=-coff
++		;;
++	tic6x | c6x*)
++		basic_machine=tic6x-unknown
++		os=-coff
++		;;
++	tx39)
++		basic_machine=mipstx39-unknown
++		;;
++	tx39el)
++		basic_machine=mipstx39el-unknown
++		;;
++	toad1)
++		basic_machine=pdp10-xkl
++		os=-tops20
++		;;
++	tower | tower-32)
++		basic_machine=m68k-ncr
++		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
++	udi29k)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	ultra3)
++		basic_machine=a29k-nyu
++		os=-sym1
++		;;
++	v810 | necv810)
++		basic_machine=v810-nec
++		os=-none
++		;;
++	vaxv)
++		basic_machine=vax-dec
++		os=-sysv
++		;;
++	vms)
++		basic_machine=vax-dec
++		os=-vms
++		;;
++	vpp*|vx|vx-*)
++		basic_machine=f301-fujitsu
++		;;
++	vxworks960)
++		basic_machine=i960-wrs
++		os=-vxworks
++		;;
++	vxworks68)
++		basic_machine=m68k-wrs
++		os=-vxworks
++		;;
++	vxworks29k)
++		basic_machine=a29k-wrs
++		os=-vxworks
++		;;
++	w65*)
++		basic_machine=w65-wdc
++		os=-none
++		;;
++	w89k-*)
++		basic_machine=hppa1.1-winbond
++		os=-proelf
++		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
++	xps | xps100)
++		basic_machine=xps100-honeywell
++		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
++	z8k-*-coff)
++		basic_machine=z8k-unknown
++		os=-sim
++		;;
++	none)
++		basic_machine=none-none
++		os=-none
++		;;
++
++# Here we handle the default manufacturer of certain CPU types.  It is in
++# some cases the only manufacturer, in others, it is the most popular.
++	w89k)
++		basic_machine=hppa1.1-winbond
++		;;
++	op50n)
++		basic_machine=hppa1.1-oki
++		;;
++	op60c)
++		basic_machine=hppa1.1-oki
++		;;
++	romp)
++		basic_machine=romp-ibm
++		;;
++	mmix)
++		basic_machine=mmix-knuth
++		;;
++	rs6000)
++		basic_machine=rs6000-ibm
++		;;
++	vax)
++		basic_machine=vax-dec
++		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
++	pdp11)
++		basic_machine=pdp11-dec
++		;;
++	we32k)
++		basic_machine=we32k-att
++		;;
++	sh3 | sh4 | 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
++		;;
++	cydra)
++		basic_machine=cydra-cydrome
++		;;
++	orion)
++		basic_machine=orion-highlevel
++		;;
++	orion105)
++		basic_machine=clipper-highlevel
++		;;
++	mac | mpw | mac-mpw)
++		basic_machine=m68k-apple
++		;;
++	pmac | pmac-mpw)
++		basic_machine=powerpc-apple
++		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
++	*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++esac
++
++# Here we canonicalize certain aliases for manufacturers.
++case $basic_machine in
++	*-digital*)
++		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		;;
++	*-commodore*)
++		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		;;
++	*)
++		;;
++esac
++
++# Decode manufacturer-specific aliases for certain operating systems.
++
++if [ x"$os" != x"" ]
++then
++case $os in
++        # First match some system type aliases
++        # that might get confused with valid system types.
++	# -solaris* is a basic system type, with this one exception.
++	-solaris1 | -solaris1.*)
++		os=`echo $os | sed -e 's|solaris1|sunos4|'`
++		;;
++	-solaris)
++		os=-solaris2
++		;;
++	-svr4*)
++		os=-sysv4
++		;;
++	-unixware*)
++		os=-sysv4.2uw
++		;;
++	-gnu/linux*)
++		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
++		;;
++	# First accept the basic system types.
++	# The portable systems comes first.
++	# Each alternative MUST END IN A *, to match a version number.
++	# -sysv* is not here because it comes later, after sysvr4.
++	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
++	      | -aos* \
++	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
++	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
++	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
++	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++	# Remember, each alternative MUST END IN *, to match a version number.
++		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto-qnx*)
++		;;
++	-nto*)
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
++		;;
++	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++		;;
++	-mac*)
++		os=`echo $os | sed -e 's|mac|macos|'`
++		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
++	-linux*)
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
++		;;
++	-sunos5*)
++		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		;;
++	-sunos6*)
++		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		;;
++	-opened*)
++		os=-openedition
++		;;
++        -os400*)
++		os=-os400
++		;;
++	-wince*)
++		os=-wince
++		;;
++	-osfrose*)
++		os=-osfrose
++		;;
++	-osf*)
++		os=-osf
++		;;
++	-utek*)
++		os=-bsd
++		;;
++	-dynix*)
++		os=-bsd
++		;;
++	-acis*)
++		os=-aos
++		;;
++	-atheos*)
++		os=-atheos
++		;;
++	-syllable*)
++		os=-syllable
++		;;
++	-386bsd)
++		os=-bsd
++		;;
++	-ctix* | -uts*)
++		os=-sysv
++		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
++	-ns2 )
++		os=-nextstep2
++		;;
++	-nsk*)
++		os=-nsk
++		;;
++	# Preserve the version number of sinix5.
++	-sinix5.*)
++		os=`echo $os | sed -e 's|sinix|sysv|'`
++		;;
++	-sinix*)
++		os=-sysv4
++		;;
++        -tpf*)
++		os=-tpf
++		;;
++	-triton*)
++		os=-sysv3
++		;;
++	-oss*)
++		os=-sysv3
++		;;
++	-svr4)
++		os=-sysv4
++		;;
++	-svr3)
++		os=-sysv3
++		;;
++	-sysvr4)
++		os=-sysv4
++		;;
++	# This must come after -sysvr4.
++	-sysv*)
++		;;
++	-ose*)
++		os=-ose
++		;;
++	-es1800*)
++		os=-ose
++		;;
++	-xenix)
++		os=-xenix
++		;;
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
++		;;
++	-aros*)
++		os=-aros
++		;;
++	-kaos*)
++		os=-kaos
++		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
++	-none)
++		;;
++	*)
++		# Get rid of the `-' at the beginning of $os.
++		os=`echo $os | sed 's/[^-]*-//'`
++		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		exit 1
++		;;
++esac
++else
++
++# Here we handle the default operating systems that come with various machines.
++# The value should be what the vendor currently ships out the door with their
++# machine or put another way, the most popular os provided with the machine.
++
++# Note that if you're going to try to match "-MANUFACTURER" here (say,
++# "-sun"), then you have to tell the case statement up towards the top
++# that MANUFACTURER isn't an operating system.  Otherwise, code above
++# will signal an error saying that MANUFACTURER isn't an operating
++# system, and we'll never get to this point.
++
++case $basic_machine in
++	*-acorn)
++		os=-riscix1.2
++		;;
++	arm*-rebel)
++		os=-linux
++		;;
++	arm*-semi)
++		os=-aout
++		;;
++    c4x-* | tic4x-*)
++        os=-coff
++        ;;
++	# This must come before the *-dec entry.
++	pdp10-*)
++		os=-tops20
++		;;
++	pdp11-*)
++		os=-none
++		;;
++	*-dec | vax-*)
++		os=-ultrix4.2
++		;;
++	m68*-apollo)
++		os=-domain
++		;;
++	i386-sun)
++		os=-sunos4.0.2
++		;;
++	m68000-sun)
++		os=-sunos3
++		# This also exists in the configure program, but was not the
++		# default.
++		# os=-sunos4
++		;;
++	m68*-cisco)
++		os=-aout
++		;;
++	mips*-cisco)
++		os=-elf
++		;;
++	mips*-*)
++		os=-elf
++		;;
++	or32-*)
++		os=-coff
++		;;
++	*-tti)	# must be before sparc entry or we get the wrong os.
++		os=-sysv3
++		;;
++	sparc-* | *-sun)
++		os=-sunos4.1.1
++		;;
++	*-be)
++		os=-beos
++		;;
++	*-ibm)
++		os=-aix
++		;;
++    	*-knuth)
++		os=-mmixware
++		;;
++	*-wec)
++		os=-proelf
++		;;
++	*-winbond)
++		os=-proelf
++		;;
++	*-oki)
++		os=-proelf
++		;;
++	*-hp)
++		os=-hpux
++		;;
++	*-hitachi)
++		os=-hiux
++		;;
++	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
++		os=-sysv
++		;;
++	*-cbm)
++		os=-amigaos
++		;;
++	*-dg)
++		os=-dgux
++		;;
++	*-dolphin)
++		os=-sysv3
++		;;
++	m68k-ccur)
++		os=-rtu
++		;;
++	m88k-omron*)
++		os=-luna
++		;;
++	*-next )
++		os=-nextstep
++		;;
++	*-sequent)
++		os=-ptx
++		;;
++	*-crds)
++		os=-unos
++		;;
++	*-ns)
++		os=-genix
++		;;
++	i370-*)
++		os=-mvs
++		;;
++	*-next)
++		os=-nextstep3
++		;;
++	*-gould)
++		os=-sysv
++		;;
++	*-highlevel)
++		os=-bsd
++		;;
++	*-encore)
++		os=-bsd
++		;;
++	*-sgi)
++		os=-irix
++		;;
++	*-siemens)
++		os=-sysv4
++		;;
++	*-masscomp)
++		os=-rtu
++		;;
++	f30[01]-fujitsu | f700-fujitsu)
++		os=-uxpv
++		;;
++	*-rom68k)
++		os=-coff
++		;;
++	*-*bug)
++		os=-coff
++		;;
++	*-apple)
++		os=-macos
++		;;
++	*-atari*)
++		os=-mint
++		;;
++	*)
++		os=-none
++		;;
++esac
++fi
++
++# Here we handle the case where we know the os, and the CPU type, but not the
++# manufacturer.  We pick the logical manufacturer.
++vendor=unknown
++case $basic_machine in
++	*-unknown)
++		case $os in
++			-riscix*)
++				vendor=acorn
++				;;
++			-sunos*)
++				vendor=sun
++				;;
++			-aix*)
++				vendor=ibm
++				;;
++			-beos*)
++				vendor=be
++				;;
++			-hpux*)
++				vendor=hp
++				;;
++			-mpeix*)
++				vendor=hp
++				;;
++			-hiux*)
++				vendor=hitachi
++				;;
++			-unos*)
++				vendor=crds
++				;;
++			-dgux*)
++				vendor=dg
++				;;
++			-luna*)
++				vendor=omron
++				;;
++			-genix*)
++				vendor=ns
++				;;
++			-mvs* | -opened*)
++				vendor=ibm
++				;;
++			-os400*)
++				vendor=ibm
++				;;
++			-ptx*)
++				vendor=sequent
++				;;
++			-tpf*)
++				vendor=ibm
++				;;
++			-vxsim* | -vxworks* | -windiss*)
++				vendor=wrs
++				;;
++			-aux*)
++				vendor=apple
++				;;
++			-hms*)
++				vendor=hitachi
++				;;
++			-mpw* | -macos*)
++				vendor=apple
++				;;
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++				vendor=atari
++				;;
++			-vos*)
++				vendor=stratus
++				;;
++		esac
++		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		;;
++esac
++
++echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -urNad cyrus-imapd-2.2.13/configure /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure
+--- cyrus-imapd-2.2.13/configure	2006-05-12 12:23:20.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure	2006-05-19 15:21:21.165748002 +0200
+@@ -309,7 +309,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 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 WITH_IDLE 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 CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR 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 WITH_IDLE 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 CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -844,6 +844,7 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-warnings-are-errors   add -Werror to most gcc calls
+   --disable-sieve         disable Sieve support
+   --enable-krb5afspts     compile afskrb PTS module with krb5 support
+   --disable-server        disable compiling servers
+@@ -994,7 +995,7 @@
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+@@ -1424,6 +1425,14 @@
+ 
+ 
+ 
++WARNERROR=-W
++# Check whether --enable-warnings-are-errors or --disable-warnings-are-errors was given.
++if test "${enable_warnings_are_errors+set}" = set; then
++  enableval="$enable_warnings_are_errors"
++   if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi
++fi;
++
++
+ 
+ # Check whether --with-extraident or --without-extraident was given.
+ if test "${with_extraident+set}" = set; then
+@@ -2116,8 +2125,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2175,8 +2183,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2292,8 +2299,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2347,8 +2353,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2393,8 +2398,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2438,8 +2442,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2984,8 +2987,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3039,8 +3041,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3187,8 +3188,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3219,60 +3219,6 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for long file names" >&5
+-echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+-if test "${ac_cv_sys_long_file_names+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_sys_long_file_names=yes
+-# Test for long file names in all the places we know might matter:
+-#      .		the current directory, where building will happen
+-#      $prefix/lib	where we will be installing things
+-#      $exec_prefix/lib	likewise
+-# eval it to expand exec_prefix.
+-#      $TMPDIR		if set, where it might want to write temporary files
+-# if $TMPDIR is not set:
+-#      /tmp		where it might want to write temporary files
+-#      /var/tmp		likewise
+-#      /usr/tmp		likewise
+-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
+-  ac_tmpdirs=$TMPDIR
+-else
+-  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
+-fi
+-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
+-  test -d $ac_dir || continue
+-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
+-  ac_xdir=$ac_dir/cf$$
+-  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
+-  ac_tf1=$ac_xdir/conftest9012345
+-  ac_tf2=$ac_xdir/conftest9012346
+-  (echo 1 >$ac_tf1) 2>/dev/null
+-  (echo 2 >$ac_tf2) 2>/dev/null
+-  ac_val=`cat $ac_tf1 2>/dev/null`
+-  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
+-    ac_cv_sys_long_file_names=no
+-    rm -rf $ac_xdir 2>/dev/null
+-    break
+-  fi
+-  rm -rf $ac_xdir 2>/dev/null
+-done
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
+-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+-if test $ac_cv_sys_long_file_names = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_FILE_NAMES 1
+-_ACEOF
+-
+-fi
+-
+-if test $ac_cv_sys_long_file_names = no; then
+-	{ { echo "$as_me:$LINENO: error: The Cyrus IMAPD requires support for long file names" >&5
+-echo "$as_me: error: The Cyrus IMAPD requires support for long file names" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ echo "$as_me:$LINENO: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+@@ -3302,8 +3248,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3345,155 +3290,6 @@
+ esac
+ 
+ 
+-
+-echo "$as_me:$LINENO: checking for __attribute__" >&5
+-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
+-if test "${ac_cv___attribute__+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h>
+-
+-int
+-main ()
+-{
+-
+-static void foo(void) __attribute__ ((noreturn));
+-
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv___attribute__=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv___attribute__=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-if test "$ac_cv___attribute__" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE___ATTRIBUTE__ 1
+-_ACEOF
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
+-
+-
+-echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
+-echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
+-if test "${ac_cv_fpic+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-save_CFLAGS=$CFLAGS
+-CFLAGS="${CFLAGS} -fPIC"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h>
+-
+-int
+-main ()
+-{
+-
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_fpic=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_fpic=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-CFLAGS=$save_CFLAGS
+-
+-fi
+-
+-if test "$ac_cv_fpic" = "yes"; then
+-    FPIC_CFLAGS="-fPIC"
+-else
+-    FPIC_CFLAGS=""
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+-echo "${ECHO_T}$ac_cv_fpic" >&6
+-
+-
+ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+@@ -3527,8 +3323,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3698,8 +3493,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3732,9 +3526,9 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
+-if test "${ac_cv_type_long+set}" = set; then
++echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6
++if test "${ac_cv_type_long_long_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -3747,9 +3541,9 @@
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((long long int *) 0)
+   return 0;
+-if (sizeof (long))
++if (sizeof (long long int))
+   return 0;
+   ;
+   return 0;
+@@ -3764,8 +3558,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3777,24 +3570,24 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_type_long=yes
++  ac_cv_type_long_long_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
++ac_cv_type_long_long_int=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_long+set}" = set; then
++echo "$as_me:$LINENO: checking size of long long int" >&5
++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_long" = yes; then
++  if test "$ac_cv_type_long_long_int" = yes; then
+   # The cast to unsigned long works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+@@ -3811,7 +3604,7 @@
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -3827,8 +3620,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3852,7 +3644,7 @@
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -3868,8 +3660,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3909,7 +3700,7 @@
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -3925,8 +3716,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3950,7 +3740,7 @@
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -3966,8 +3756,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4015,7 +3804,7 @@
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4031,8 +3820,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4054,20 +3842,100 @@
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+-?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long long int), 77
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long long int)); }
++unsigned long ulongval () { return (long) (sizeof (long long int)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long long int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long long int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
++echo "$as_me: error: cannot compute sizeof (long long int), 77
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for unsigned long long int" >&5
++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4076,8 +3944,332 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++int
++main ()
++{
++if ((unsigned long long int *) 0)
++  return 0;
++if (sizeof (unsigned long long int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_unsigned_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_unsigned_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of unsigned long long int" >&5
++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (unsigned long long int)); }
++unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -4087,17 +4279,17 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     exit (1);
+-  if (((long) (sizeof (long))) < 0)
++  if (((long) (sizeof (unsigned long long int))) < 0)
+     {
+       long i = longval ();
+-      if (i != ((long) (sizeof (long))))
++      if (i != ((long) (sizeof (unsigned long long int))))
+ 	exit (1);
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
++      if (i != ((long) (sizeof (unsigned long long int))))
+ 	exit (1);
+       fprintf (f, "%lu\n", i);
+     }
+@@ -4118,16 +4310,16 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_sizeof_long=`cat conftest.val`
++  ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -4136,127 +4328,810 @@
+ fi
+ rm -f conftest.val
+ else
+-  ac_cv_sizeof_long=0
++  ac_cv_sizeof_unsigned_long_long_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6
+ cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
+ _ACEOF
+ 
+ 
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
+ 
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_LONG_INT
++_ACEOF
+ 
+-   # CMU GUESS RUNPATH SWITCH
+-  echo "$as_me:$LINENO: checking for runpath switch" >&5
+-echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
+-if test "${andrew_runpath_switch+set}" = set; then
++  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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
+ 
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
+ 
+ int
+ main ()
+ {
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++int
++main ()
++{
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++  yes)
++
++cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++fi
++
++
++echo "$as_me:$LINENO: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
++if test "${ac_cv___attribute__+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  andrew_runpath_switch="-R"
++  ac_cv___attribute__=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_cv___attribute__=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+ 
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
++if test "$ac_cv___attribute__" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++
++echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
++echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
++if test "${ac_cv_fpic+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++save_CFLAGS=$CFLAGS
++CFLAGS="${CFLAGS} -fPIC"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_fpic=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_fpic=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_CFLAGS
++
++fi
++
++if test "$ac_cv_fpic" = "yes"; then
++    FPIC_CFLAGS="-fPIC"
++else
++    FPIC_CFLAGS=""
++fi
++echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
++echo "${ECHO_T}$ac_cv_fpic" >&6
++
++
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++test_array [0] = 0
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  andrew_runpath_switch="-Wl,-rpath,"
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-andrew_runpath_switch="none"
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  LDFLAGS="${SAVE_LDFLAGS}"
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++
++
++   # CMU GUESS RUNPATH SWITCH
++    andrew_runpath_switch="none"
++
+ 
+ 
+ 
+@@ -4295,8 +5170,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4483,8 +5357,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4596,8 +5469,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4669,8 +5541,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4742,8 +5613,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4797,8 +5667,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4869,8 +5738,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4924,8 +5792,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5028,8 +5895,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5094,8 +5960,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5162,8 +6027,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5261,8 +6125,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5326,8 +6189,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5421,8 +6283,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5526,8 +6387,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5594,8 +6454,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5684,8 +6543,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5809,8 +6667,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5917,8 +6774,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5985,8 +6841,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6075,8 +6930,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6200,8 +7054,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6325,8 +7178,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6393,8 +7245,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6483,8 +7334,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6608,8 +7458,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6694,8 +7543,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6758,8 +7606,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6828,8 +7675,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6977,8 +7823,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7040,8 +7885,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7106,8 +7950,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7153,8 +7996,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7228,8 +8070,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7337,8 +8178,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7432,8 +8272,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7568,8 +8407,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7701,7 +8539,7 @@
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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 db-4.3 db4.3 db43 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
+@@ -7728,8 +8566,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7778,8 +8615,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7997,8 +8833,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8064,8 +8899,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8154,8 +8988,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8223,8 +9056,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8297,8 +9129,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8352,8 +9183,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8418,8 +9248,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8609,8 +9438,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8683,8 +9511,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8868,8 +9695,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8970,8 +9796,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9074,8 +9899,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9177,8 +10001,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9335,8 +10158,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9403,8 +10225,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9466,8 +10287,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9610,8 +10430,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9920,8 +10739,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9981,8 +10799,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10228,8 +11045,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10322,8 +11138,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10431,8 +11246,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10502,8 +11316,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10613,8 +11426,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10682,8 +11494,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10752,8 +11563,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10882,8 +11692,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10998,8 +11807,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11128,8 +11936,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11218,8 +12025,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11328,8 +12134,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11475,8 +12280,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11589,8 +12393,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11661,8 +12464,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11731,8 +12533,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -11886,8 +12687,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12029,8 +12829,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12091,8 +12890,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12235,8 +13033,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12676,8 +13473,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12839,8 +13635,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12906,8 +13701,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13008,8 +13802,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13074,8 +13867,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13208,8 +14000,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13352,8 +14143,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13523,8 +14313,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13613,8 +14402,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13690,8 +14478,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13785,8 +14572,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13853,8 +14639,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13939,8 +14724,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14198,8 +14982,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14303,8 +15086,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14422,8 +15204,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14560,8 +15341,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14752,8 +15532,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14890,8 +15669,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15036,8 +15814,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15227,8 +16004,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15417,8 +16193,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15483,8 +16258,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15560,8 +16334,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15623,8 +16396,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15664,8 +16436,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15721,8 +16492,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15762,8 +16532,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15827,8 +16596,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -15859,10 +16627,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -16021,8 +16787,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16079,8 +16844,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16249,8 +17013,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16417,8 +17180,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16475,8 +17237,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16645,8 +17406,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -17357,6 +18117,7 @@
+ s,@host_cpu@,$host_cpu,;t t
+ s,@host_vendor@,$host_vendor,;t t
+ s,@host_os@,$host_os,;t t
++s,@WARNERROR@,$WARNERROR,;t t
+ s,@MAKEDEPEND@,$MAKEDEPEND,;t t
+ s,@cyrus_prefix@,$cyrus_prefix,;t t
+ s,@service_path@,$service_path,;t t
+@@ -17604,11 +18365,6 @@
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+@@ -17647,6 +18403,12 @@
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/templates.pot
+++ cyrus-imapd-2.2-2.2.13/debian/po/templates.pot
@@ -0,0 +1,73 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/POTFILES.in
+++ cyrus-imapd-2.2-2.2.13/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] cyrus-common-2.2.templates
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/cs.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/cs.po
@@ -0,0 +1,81 @@
+# Czech translation of cyrus-imapd-2.2 templates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-10 09:48-0700\n"
+"PO-Revision-Date: 2005-12-29 16:07+0100\n"
+"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "Backendy databáze se změnily!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Srovnání mezi /usr/lib/cyrus/cyrus-db-types.txt a /usr/lib/cyrus/cyrus-db-"
+"types.active ukázalo, že se změnil backend databáze pro Cyrus IMAPd."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"To znamená, že ty databáze, u kterých se databázové backendy změnily, budou "
+"možná vyžadovat ruční převod do nového formátu utilitou cvt_cyrusdb(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus21-common/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Pro vĂ­ce informacĂ­ se prosĂ­m podĂ­vejte do /usr/share/doc/cyrus21-common/"
+"README.Debian.database. Nespouštějte cyrmaster, dokud nepřevedete databáze "
+"do nového formátu."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Odstranit spool adresáře Cyrusu a uživatelské Sieve skripty?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Mám při odstranění balíčku smazat spool adresář s poštou, news příspěvky a "
+"také uživatelské filtrovací skripty v jazyce Sieve?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Tato otázka se týká pouze výchozích spool adresářů a Sieve skriptů ve /var. "
+"Při změně jejich umístění v imapd.conf nebude odstraněno jejich nové "
+"umístění, ale pouze jejich staré ve /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/de.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/de.po
@@ -0,0 +1,95 @@
+# translation of cyrus22-imapd_2.1.16-6_de.po to German
+# translation of cyrus22-imapd_2.1.16-6_templates.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Erik Schanze <mail@erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2_2.2.12-1_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-05-29 22:44+0200\n"
+"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "Datenbankanbindung hat sich geändert!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Wenn Sie die Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/cyrus/"
+"cyrus-db-types.active vergleichen, sehen Sie, dass die Datenbankanbindung "
+"des Cyrus IMAPd geändert wurde."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Die Datenbanken, für die sich die Anbindung geändert hat, müssenmit dem "
+"Hilfsprogramm cvt_cyrusdb(8) manuell in das neue Format ĂĽberfĂĽhrt werden."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Mehr Informationen finden Sie in der Datei /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database.  Starten Sie keinesfalls cyrmaster, bevor Sie die "
+"Datenbank in das neue Format ĂĽberfĂĽhrt haben."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus-Spool und Filterskripte der Benutzer löschen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Sollen die Cyrus Email- bzw. News-Spools und die Filterskripte der Benutzer "
+"gelöscht werden, wenn das Paket restlos entfernt wird (purge)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Diese Frage betrifft nur die Standard-Spools und -Filterskriptverzeichnisse "
+"in /var.  Wenn Sie deren Ort in der Datei imapd.conf geändert haben, werden "
+"sie an der neuen Stelle nicht gelöscht, nur die alten im Verzeichnis /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/fr.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/fr.po
@@ -0,0 +1,82 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh@debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: fr.po 247 2005-12-29 16:29:27Z sven $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: 2002-10-22 10:33+0200\n"
+"Last-Translator: Philippe Batailler <pbatailler@teaser.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "L'interfaçage avec les bases de données a changé !"
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Une comparaison entre /usr/lib/cyrus/cyrus-db-types.txt et /usr/lib/cyrus/"
+"cyrus-db-types.active montre que l'interfaçage de Cyrus IMAPd avec les bases "
+"de données a changé."
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Cela signifie que les bases de données pour lesquelles l'interfaçage a "
+"changé peuvent nécessiter une conversion manuelle au nouveau format. On peut "
+"se servir de l'utilitaire cvt_cyrusdb (8)."
+
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Veuillez-vous reporter ŕ /usr/share/doc/cyrus-common-2.2/README.Debian.database pour "
+"des informations supplémentaires. Ne lancez pas cyrmaster avant d'avoir mis "
+"les bases de données au nouveau format."
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+"Faut-il supprimer les répertoires de spool propres ŕ Cyrus, ainsi que les "
+"filtres des utilisateurs ?"
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Dois-je supprimer les répertoires de spool pour le courrier et les "
+"nouvelles, ainsi que les filtres des utilisateurs, quand le systčme est "
+"purgé du paquet ?"
+
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Cette question concerne uniquement les répertoires par défaut situés dans /"
+"var et contenant le spool et les filtres. Si vous aviez modifié leurs "
+"emplacements grâce au fichier imapd.conf, ces emplacements ne seront pas "
+"supprimés ; seuls les anciens, dans /var, le seront."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/it.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/it.po
@@ -0,0 +1,82 @@
+# Traduzione italiana di cyrus22-imapd
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Cristian Rigamonti <cri@linux.it>, 2004.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-28 20:17+0200\n"
+"Last-Translator: Cristian Rigamonti <cri@linux.it>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "I backend del database sono cambiati!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Il confronto tra /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active mostra che i backend di database per Cyrus IMAPd sono cambiati."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Ciň significa che i database per cui sono cambiati i backend devono essere "
+"convertiti manualmente al nuovo formato, usando l'utilitŕ cvt_cyrusdb(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Si veda /usr/share/doc/cyrus-common-2.2/README.Debian.database per maggiori "
+"informazioni.  Non avviare cyrmaster prima di aver convertito i database al "
+"nuovo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Si desidera rimuovere gli spool di posta e news di Cyrus, oltre agli script "
+"sieve degli utenti, quando il pacchetto sarŕ rimosso?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Questa domanda si riferisce solo agli spool predefiniti e alle directory "
+"degli script sieve in /var.  Se la loro posizione č stata modificata in "
+"imapd.conf, non saranno rimosse le nuove posizioni, ma solo quelle in /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/ja.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/ja.po
@@ -0,0 +1,93 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-01 03:04+0900\n"
+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "ĄĐĄĂĄŻĄ¨ĄóĄÉ¤ÎĄÇˇĽĄżĄŮˇĽĄą¤¬ĘŃąą¤µ¤ě¤Ţ¤·¤ż!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"/usr/lib/cyrus/cyrus-db-types.txt ¤Č /usr/lib/cyrus/cyrus-db-types.active ¤ň"
+"ČćłÓ¤·¤ż¤Č¤ł¤í Cyrus IMAPd ¤ÎĄÇˇĽĄżĄŮˇĽĄą¤¬ĘŃąą¤µ¤ě¤Ć¤¤¤Ţ¤ąˇŁ"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"¤ł¤ě¤é¤ÎĄĐĄĂĄŻĄ¨ĄóĄÉ¤¬ĘŃąą¤µ¤ě¤żĄÇˇĽĄżĄŮˇĽĄą¤Ď cvt_cyrusdb(8) ĄćˇĽĄĆĄŁĄęĄĆĄŁ"
+"¤ň»Č¤Ă¤ĆĽęĆ°¤Çż·¤·¤¤·ÁĽ°¤ËĘŃ´ą¤ą¤ëɬÍפ¬¤˘¤ę¤Ţ¤ąˇŁ"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"¤č¤ęľÜşŮ¤Ë¤Ä¤¤¤Ć¤Ď /usr/share/doc/cyrus-common-2.2/README.Debian.database ¤ň»˛"
+"ľČ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁĄÇˇĽĄżĄŮˇĽĄą¤ňż·¤·¤¤·ÁĽ°¤ËĘŃ´ą¤ą¤ë¤Ţ¤Ç cyrmaster ¤ňµŻĆ°¤·¤Ę¤¤"
+"¤Ç¤Ż¤Ŕ¤µ¤¤ˇŁ"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus ĄąĄ×ˇĽĄë¤Čˇ˘ĄćˇĽĄ¶¤Î sieve ĄąĄŻĄęĄ×ĄČ¤ňşď˝ü¤·¤Ţ¤ą¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"ĄŃĄĂĄ±ˇĽĄ¸¤¬´°Á´¤Ëşď˝ü¤µ¤ě¤żşÝˇ˘sieve ĄąĄŻĄęĄ×ĄČ¤ČƱÍÍ¤Ë Cyrus ĄáˇĽĄëˇ¦ĄËĄĺˇĽ"
+"ĄąĄąĄ×ˇĽĄë¤ňşď˝ü¤ą¤ëɬÍפ¬¤˘¤ę¤Ţ¤ą¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"¤ł¤ÎĽÁĚä¤Ď /var ¤Ë¤˘¤ëɸ˝ŕ¤ÎĄąĄ×ˇĽĄë¤Č sieve ĄąĄŻĄęĄ×ĄČĄÇĄŁĄěĄŻĄČĄę¤Ë¤Î¤ßŬÍŃ"
+"¤µ¤ě¤Ţ¤ąˇŁimapd.conf ¤ÇĄÇĄŁĄěĄŻĄČĄę¤ňĘŃąą¤·¤Ć¤¤¤ëľěąçˇ˘ĘŃąą¸ĺ¤ÎĄÇĄŁĄěĄŻĄČĄę¤Ë"
+"¤˘¤ë¤â¤Î¤Ďşď˝ü¤µ¤ě¤Ţ¤»¤óˇŁ/var ¤Ë¤˘¤ë¸Ĺ¤¤¤â¤Î¤Ŕ¤±¤Ç¤ąˇŁ"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/nl.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/nl.po
@@ -0,0 +1,94 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-29 10:57+0100\n"
+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "Databank-backends zijn gewijzigd!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
+"cyrus-db-types.active leert ons dat de databank-backends voor Cyrus IMAPd "
+"gewijzigd zijn."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Dit betekent dat deze databanken, waarvan de databank-backends gewijzigd "
+"zijn, mogelijk handmatig geconverteerd moeten worden naar het nieuwe "
+"formaat, gebruik makend van het cvt_cyrusdb(8)-hulpmiddel."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Raadpleeg /usr/share/doc/cyrus-common-2.2/README.Debian.database voor meer "
+"informatie. Start cyrmaster niet vooraleer u de databanken naar het nieuwe "
+"formaat geconverteerd hebt."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
+"gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
+"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
+"zal de nieuwe locatie niet verwijderd worden; enkel de oude in /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/pt_BR.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/pt_BR.po
@@ -0,0 +1,87 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh@debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: pt_BR.po 247 2005-12-29 16:29:27Z sven $
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.1.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2003-03-03 10:45-0300\n"
+"Last-Translator: Henrique de Moraes Holschuh <hmh@debian.org>\n"
+"Language-Team: pt_BR <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "Mudança de sistema nas bases de dados!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Comparaçăo entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active levam a crer que o sistema de base de dados do Cyrus IMAPd foi "
+"mudado."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Isso significa que as bases de dados cujo sistema mudou precisam ser "
+"migradas para o novo sistema manualmente, através do utilitário cvt_cyrusdb"
+"(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Maiores informaçőes estăo disponíveis em /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database.  Năo inicie cyrmaster até ter convertido o "
+"formatodas bases de dados."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Removo as spools do Cyrus e os scripts sieve?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
+"as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "
+"for eliminado (purge) do sistema ?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Apenas as áreas padrăo em /var serăo removidas. Caso vocę tenha configurado "
+"outras áreas em imapd.conf, elas năo serăo removidas."
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.database
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.database
@@ -0,0 +1,122 @@
+Cyrus IMAP for Debian: Database backend conversion
+$Id: README.Debian.database 229 2005-12-08 23:26:29Z astronut $
+--------------------------------------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+There is also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
+collection.  Upgrade hints are in UPGRADE.Debian.  Outdated documentation will
+cause you much grief, so beware of that when hunting anywhere else than the
+Cyrus mailinglist for information.
+
+
+Database backends
+-----------------
+
+Cyrus can be compiled to use different types of database backends for each of
+its databases.  The package will warn you if you try to start Cyrus and the
+database backends seem to have changed since the last active version.
+
+After converting all the mail stores and /var/lib/cyrus to use the proper
+database backends using cvt_cyrusdb(8), remove
+/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2"
+once to reset the error trigger, and start cyrmaster.
+
+If cvt-cyrusdb locks up just at the beginning of the conversion, your databases
+might be locked.  Unlock them (i.e. REALLY stop Cyrus if it is still running,
+use the db3* utilities to clean any stray locks, or try a reboot).
+
+Step-by-step conversion guide:
+
+1. Stop the Cyrus system
+   /etc/init.d/cyrus2.2 stop
+   
+2. Find out which databases to convert:
+   diff -u /usr/lib/cyrus/cyrus-db-types.active \
+           /usr/lib/cyrus/cyrus-db-types.txt
+
+   The databases are these in the default install:
+   DUPLICATE		/var/lib/cyrus/deliver.db
+   MBOX			/var/lib/cyrus/mailboxes.db
+   TLS			/var/lib/cyrus/tls_sessions.db
+
+   Don't bother upgrading the TLS database, just delete it: the information
+   there is not reused when you stop Cyrus.
+
+   If the BerkeleyDB version is what was changed, you need to use the
+   Berkeley DB upgrade utility in all db* databases.  See the manpages for
+   db*_upgrade.
+
+   The SUBS and SEEN databases are different: there are many of them (one
+   for every mail folder of every user for SEEN; one for every user for
+   SUBS) and you need to convert every single one of them.
+
+   SUBS			/var/lib/cyrus/...../*.subs
+   SEEN			/var/lib/cyrus/...../*.seen
+
+   SUBS contains the subscribed folders, and SEEN contains the seen state
+   of every mail in a folder.
+
+   Types db3_nosync and db3 are the same for database conversion matters.
+
+2.1 Converting from DB* to SKIPLIST
+
+   As user cyrus, do the following:
+   
+   cd /
+   /usr/sbin/cvt_cyrusdb <fullpath to database> db3 \
+                         /var/lib/cyrus/temp.db flat
+   rm -f <fullpath to database>
+   /usr/sbin/cvt_cyrusdb /var/lib/cyrus/temp.db flat \
+                         <fullpath to database> skiplist
+   chown cyrus:mail <fullpath to database>
+   rm -f /var/lib/cyrus/temp.db
+
+2.2 Converting from FLAT to SKIPLIST
+
+   As user cyrus, do the following:
+
+   cd /
+   mv <fullpath to database> <fullpath to database>.old
+   /usr/sbin/cvt_cyrusdb <fullpath to database>.old flat \
+                         <fullpath to database> skiplist
+   chown cyrus:mail <fullpath to database>
+   rm -f <fullpath to database>.old
+
+2.3 SUBS and SEEN databases
+
+   I suggest using a small shell script and using "find" to mass-convert
+   the SEEN databases:
+   find /var/lib/cyrus -type f -name '*.seen' -exec myshellscript {} \;
+
+   The "find" command above you give you the name of the database as "$1"
+   inside your shell script.
+
+3. Reset the database backend change system
+   rm /usr/lib/cyrus/cyrus-db-types.active
+   dpkg-reconfigure cyrus-common-2.2
+
+4. Start Cyrus, if not started by step 3
+   /etc/init.d/cyrus2.2 start
+
+WHY THERE IS NO AUTOMATED UPGRADE SCRIPT:  Because I dislike people who do not
+read docs, and one Debian user asked me exactly the wrong thing (about
+cyrus21-imapd) while I was in the middle of writing said script AND I am quite
+short on time lately: it is much faster to write a doc than to write and test
+the script.  So, now everyone will need to read the docs to get Cyrus working
+again.  I am not holding back the skiplist change for that script anymore.
+
+Maybe someday I will finish the upgrade script.  Maybe someone else will write
+one (I will certainly include it in the package, if it is good enough).  Don't
+hold your breath, though.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian
@@ -0,0 +1,330 @@
+Cyrus IMAP for Debian
+$Id: README.Debian 229 2005-12-08 23:26:29Z astronut $
+---------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+IMPORTANT: Cyrus is a closed-box email system.  Your system will access your
+email through LMTP, IMAP and POP3 *only*.  No direct file access to the email
+store is supposed to take place.
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and
+http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi).  There is
+also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
+collection.  Upgrade hints are in UPGRADE.Debian.  Outdated documentation will
+cause you much grief, so beware of that when hunting anywhere else than the
+Cyrus mailinglist for information.
+
+Information about updated packages for Debian stable (i.e. of updates that
+are not necessarily security updates) is available at 
+http://people.debian.org/~hmh/
+
+WARNING: For one to get Cyrus IMAPd to work correctly, one must first get the
+SASL layer to work correctly.  This is far from trivial, so if you don't manage
+at first, don't go around filling bugs against Cyrus IMAPd before you make damn
+sure it is not a SASL configuration error.  Read the hint list later on this
+file as well.  Start by reading README.Debian.simpleinstall.
+
+The Debian packaging of Cyrus has a few quirks which are important to know
+about:
+
+1. Renaming of some Cyrus IMAP utilities
+
+   The quota, reconstruct, master and deliver utilities have been renamed to
+   cyrquota, cyrreconstruct, cyrmaster and cyrdeliver, following the template
+   set by upstream with "cyradm".  This was done because both Cyrus Debian
+   maintainers found the original names to be too generic and likely to cause
+   namespace collisions later.
+
+   Since documentation may refer to these utilities using their original
+   name, you must be aware of this fact.  Also, installsieve is deprecated
+   and not included in the Debian package; use sieveshell instead.
+
+2. Relocation of many Cyrus IMAP files
+
+   The default Cyrus install scatters files all over the place.  The Debian
+   package installs only a few files in /usr/bin (cyradm, sieveshell).
+   IMAP/email administrator utilities are installed in /usr/sbin (such as
+   cyrreconstruct).  Programs that must be run by cyrmaster are installed in
+   /usr/lib/cyrus (such as imapd and pop3d).  Sockets go into
+   /var/run/cyrus/socket, per FHS 2.2.  Sieve files go in /var/spool/sieve, but
+   an /etc/sieve compatibility symlink is also installed just in case.
+
+   The imapd.conf and cyrus.conf configuration files are in /etc. The PAM
+   policy files are in /etc/pam.d.
+
+   Feel free to use dpkg-statoverride to change the permission of
+   /var/run/cyrus/socket, the cyrus packages will not override your
+   configuration if dpkg-statoverride is used.  In fact, you will most probably
+   have to do so for postfix to deliver to Cyrus, for example.
+
+3. Removal of netnews support
+
+   Netnews support as it were is dead.  Cyrus 2.2 has a brand new approach,
+   and the stuff in Cyrus 2.2 is not functional, and thus removed from this
+   package.
+
+4. Debian Cyrus IMAPd logs with facility MAIL instead of LOCAL6.  Also, it
+   prefixes *all* log output with "cyrus/" (e.g.: imapd logs appear as
+   "cyrus/imapd[#####]" instead of "imapd[#####]").  This last change was
+   accepted upstream for Cyrus 2.2.
+
+5. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available.
+
+   However, you will have to configure it yourself.  No pre-packaged
+   configuration of Murder is available at this time...  The documentation is
+   all there, and the Cyrus packages will happily preserve your Cyrus Murder
+   configuration.  You do not have to install the cyrus-imapd-2.2 or
+   cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running,
+   but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those
+   packages (and they are needed by the proxies), so you will have to create
+   the files manually.
+
+   One important note: MUPDATE doesn't support TLS, so you won't be able to
+   use plaintext authentication methods.  The easiest thing to do is to put
+   an entry for your mupdate user in sasldb2 and use DIGEST-MD5. 
+
+
+General notes and hints:
+------------------------
+
+ o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after
+   you upgrade the package.
+
+ o QUOTAS ARE LIMITIED TO 2GB on some platforms.
+   Be careful to not set quotas over that ammount if your platform doesn't
+   support the C datatype "long long". Things will break in very bad ways.
+   Yes, it is a big glitch, and no, there are no easy workarounds.
+   see https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1212
+
+ o Either turn off logging of the DEBUG level, or don't complain about cyrus
+   verbosity on the logs.  Don't ever ask in the mailing lists about messages
+   logged in the DEBUG level before reading the source code.
+
+ o Watch out for your /dev/random bitbucket! SASL may use it, and if it
+   empties, it will hang the processes wrapped up by SASL.  This means
+   just about every Cyrus service (lmtp, imap, pop3, sieve)...  Disable
+   APOP in /etc/imapd.conf if you don't need it, as it is a serious draw 
+   on randomness resources.
+
+ o One extremely important point to notice is that saslauthd works ONLY
+   with plaintext.  APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other "auxprop"
+   SASL mech will *not* work through saslauthd.  This can and will cause
+   serious issues in Cyrus murder environments.
+
+ o When using ext3, Cyrus really wants data=journal.  However, up to
+   kernel 2.4.20 there are dangerous bugs in that option, so you're better
+   off not using that.  xfs is faster and better for Cyrus, anyway.
+
+ o nscd users: nscd is highly incompatible with ldap, and somewhat buggy
+   otherwise.  If you use nscd and Cyrus segfaults on you, try restarting
+   nscd, or disabling it.
+
+ o "The Debian libldap2 and cyrus-imapd packages are both compiled using the
+   SASL library.  If you use cyrus-imapd together with libnss-ldap, or
+   saslauthd together with libpam-ldap, the resulting double calls to SASL
+   library functions can trigger a double-free bug which may cause the calling
+   process to crash.  To avoid such a crash, you must recompile the libldap2
+   package --without-cyrus-sasl."  --  http://bugs.debian.org/145766 [!@#$%!!!
+   I didn't expect SASL 2.1 to still have this annoying problem]
+
+ o The lmtp service (allocated in Debian Woody to port 2003, and non-existent
+   on Debian Sarge) is non-standard.  It has no port officially allocated
+   anywhere; it is usually run bound to the localhost interface, unless one
+   needs it for clustering and high-availability scenarios.  If you need it
+   elsewhere, by all means move it -- you only need to edit /etc/services, or
+   change the port for the lmtp service in /etc/cyrus.conf.
+
+ o The lmtp service will only allow Cyrus lmtp administrators to authenticate.
+   Set them in /etc/imapd.conf.
+
+ o Cyrus can now use two different namespaces (the standard one, where all
+   subfolders are children of INBOX, and one where they are all in the same
+   hierarchical level).
+
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. If
+   you deal with a large population of winboze users, this option can save
+   you some headaches.
+
+ o One can also chose between netnews-style notation for folders
+   (INBOX.subfolder), where the "." character is reserved to separate folders;
+   or UNIX-style notation (INBOX/subfolder), where dots are allowed in names,
+   and the slash separate folders (the "^" character is reserved in this 
+   mode).
+
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details.
+
+ o When using SASL, do keep in mind that cyrus runs under user cyrus, and not
+   root.  It cannot read shadow files (unless you add the user cyrus to group
+   shadow), or perform any root-only operations directly.  You need to use the
+   saslauthd (or, if available, auxpropd) mechanism to authenticate against
+   root-only data.  And that also means user cyrus must be able to talk to the
+   unix socket saslauthd uses (which is controlled by SASL, not Cyrus IMAPd).
+
+ o Any of the SASL configure options can be inserted in imapd.conf, just
+   prefix it with "sasl_" (e.g.: sasl_mech_list: PLAIN).  The list of SASL
+   options is in /usr/share/doc/libsasl2/options.html.
+
+ o The services are tcp-wrapped.  Their hosts.allow/hosts.deny id is the
+   service name in /etc/cyrus.conf. See hosts_access(5).
+
+ o The PAM service names for use with SASL (via saslauthd) are:
+   "imap", "sieve", "lmtp", "pop", "mupdate".
+
+ o You need to specify your admin users in /etc/imapd.conf before you can
+   add mailboxes, or deliver through authenticated lmtp. Do NOT use root.
+   We suggest user cyrus, which is already used by the system for all 
+   things Cyrus IMAPd... but it need not be an existing user.  As long as
+   SASL will authenticate against it, it will work.
+
+ o Do NOT read your admin user's email via IMAP (see the FAQ for details).
+  
+ o Don't export your mail store over NFS or AFS (read the FAQ for more info).
+   You have been warned.  You really want a journaled (as in journaling for the
+   metadata), local filesystem for the store.  Failing that, you need
+   something with very strict and correct lock semanthics, and full mmap
+   support.
+
+ o Ext2 is slow on very large directories (right now), and sync medatada
+   writes enabled are a huge performance hit. If you need high IO throughput
+   from Cyrus, you will need to use ext3, reiserfs, xfs or something like
+   that.  xfs is probably the best one.
+ 
+ o You may want to enable/disable synchronous metadata writes to your mail
+   store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more
+   info, in package cyrus-docs-2.2).  The cyrus-makedirs script tries to do the
+   right thing for ext2 and ext3 filesystems.  Failure to correctly update the
+   metadata in the right order can completely screw up your Cyrus store on a
+   power-loss or another disk failure.
+
+ o Try mounting the store and cyrus database filesystems with noatime for
+   performance gains.  Load-balance the store using multiple partitions on
+   different physical devices for even better performance gains.
+
+ o Cyrus IMAPd should be fed mail through LMTP.  If at all possible, use
+   the Unix socket for that -- it automatically authenticates as user
+   postman and that will help wonders.  cyrdeliver can also be used to
+   inject mail, but it will simply open an LMTP socket to cyrus and
+   deliver through that -- this is much slower than using LMTP directly.  
+   The UNIX socket is in /var/run/cyrus/socket/lmtp.  Use dpkg-statoverride
+   if you need to change the permissions of the socket directory.
+
+ o You can use /usr/sbin/cyrus-makedirs to generate the needed directories
+   for cyrus partitions.  It is run automatically by the package postinst,
+   and it knows to parse the /etc/imapd.conf file to verify if hash
+   subdirectories are needed or not.  It cannot detect what kind of hashing
+   should be used yet.  If you recompile the package with full hashing,
+   change it.
+
+ o Refer to cyrus-utils.sourceforge.net and the info-cyrus mailinglist
+   for mailbox/imap to cyrus conversion scripts.
+
+ o If you don't use pop3, or something else enabled by default in cyrus.conf,
+   disable it.  Otherwise, Cyrus master will log warnings that the service
+   could not be started.
+
+ o If you want to run something that is not in /usr/lib/cyrus/bin in
+   cyrus.conf, just use the full path in cyrus.conf (e.g.: 
+   cmd="/usr/sbin/squatter").
+
+ o Sieveshell is really lacking on auth capabilities, and timsieved is quite
+   strict on what auth capabilities it offers.  So, pay attention to
+   sasl_minimum_layer, and see bug #151925 for more details
+   (http://bugs.debian.org/151925).  Also, make sure you have the correct set
+   of SASL2 modules installed in in your system.
+
+ o uw-mailutils has some nice utilities to migrate mail stores from/to imap
+   servers.  You might find it quite useful to migrate a site to Cyrus.
+
+Known bugs
+----------
+
+ o Group lookups in LDAP (through nss-ldap) will not work well.  See Debian
+   bug #156671.
+
+
+SNMP logging
+------------
+
+cyrmaster is an agentx SNMP subagent, and it can interface to a agentx SNMP
+master.  It will export data at OID .1.3.6.1.4.1.3.6.1 (cyrusMasterMIB).
+
+The ucd-snmp daemon (package snmpd) is NOT configured to work
+as agentx master agent by default -- you have to do that manually,
+by adding "master agentx" to the /etc/snmp/snmpd.conf file.
+
+cyrmaster will register with the snmp agentx master when it is started,
+so if the snmp master is restarted after cyrmaster, it will not forward
+the snmp requests to cyrmaster anymore.  Check your system for any cron
+scripts that might be restarting the snmp process if that happens.
+
+See /usr/share/snmp/mib/CYRUS-MASTER-MIB.txt for more details.
+
+
+Backing up for rainy days
+------------------------
+
+Cyrus automatically checkpoints and backups some of its databases, using the
+ctl_cyrusdb(8) utility (EVENTS in /etc/cyrus.conf).  It is supposed to be also
+capable of recovering automatically from these backups, and to attempt to do so
+at startup.  However, ctl_cyrusdb -r is NOT FULLY IMPLEMENTED YET... you are on
+your own to recover from corrupt databases.
+
+This recovery can be done using the db3 utilities, and even by smart usage of
+cvt_cyrusdb(8) and ctl_mboxlist(8).  The automatic backups are useful, too,
+even if they are not restored automatically.
+
+The database backups are stored at /var/lib/cyrus/db.backup*, you may want to
+copy the files there to backup media in a cronjob, or something like that.  You
+can kill the TLS cache database, as long as Cyrus is stopped when you do it.
+Loss of the delivery database is not very bad, it just means some users might
+get duplicated messages.
+
+Cyrus does NOT backup the mail store automatically.  To backup the mail store 
+partitions, you must stop Cyrus and dump the entire partition to your backup
+media.  The MH-like structure of the Cyrus store do make them suitable for
+incremental backups.  Hot-backups of the store can be made, but you risk losing
+some non-critical metadata when the restore is done.
+
+You can backup all Cyrus non-text databases to a flat text file format using the
+cvt_cyrusdb utility (and recover back from the flat text file format), but you
+should stop Cyrus first.
+
+If you ever need to recover the mail store from backup, you should run
+cyrreconstruct(8) to rebuild the mailbox indexes.
+
+A daily maintenance cronjob uses ctl_mboxlist(8) to dump the mailboxes database
+to /var/backup. That backup copy can be used as a last-resort copy if the hot
+backups become corrupted somehow.
+
+
+Debian source package quirks
+----------------------------
+
+There aren't many.  Patchset numbers as provided by the cvsps utility in its
+default configuration are used to denote patches taken from upstream CVS in the
+changelog.  Less important patches from upstream CVS (such as documentation
+updates) are applied without adding a changelog entry.
+
+
+THANKS
+------
+
+Thanks go to the CMU crew for producing Cyrus IMAPd in the first place;
+Michael-John Turner <mj@debian.org> for maintaining the v1.5 branch and setting
+the groundstones for the v2.1 package; David Parker <david@neongoat.com> and
+David D. Kilzer <ddkilzer@theracingworld.com> for their huge help in getting
+the v2.1 packages out-of-the-door, and the upgrade from v1.5 guide; Fabian
+Fagerholm <fabbe@paniq.net> for stress testing the daemons, and useful
+feedback; and Gilles Bouthenot <gilles.bouthenot@fcomte.iufm.fr> for good
+feedback.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.simpleinstall
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.simpleinstall
@@ -0,0 +1,173 @@
+Cyrus IMAP for Debian, Simple Install Guide
+$Id: README.Debian.simpleinstall 229 2005-12-08 23:26:29Z astronut $
+-------------------------------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+
+This document describes how to get Cyrus running with a simple configuration
+that you can then tweak to your real needs.
+
+READ README.Debian AS WELL. I MEAN IT!  Cyrus is easy, all the trouble is
+in SASL, and even that becomes easy after you understand how SASL works.
+
+IMPORTANT: Cyrus is a closed-box email system.  Your system will access your
+email through LMTP, IMAP and POP3 *only*.  No direct file access to the email
+store is supposed to take place.
+
+
+To setup Cyrus so that you can administer it (i.e. create users),
+and get email inside it for those users:
+
+ 1. Make sure libsasl2-modules, libsasl2 and sasl2-bin are installed
+
+ 2. Make sure /etc/sasldb2 is readable by group sasl.  Pay attention
+    to overrides (dpkg-statoverride)!
+
+ 3. Make sure user cyrus belongs to group sasl (cyrus-common-2.2's install
+    tries to do this automatically for you).
+
+ 4. Edit /etc/cyrus.conf, and make sure the services you need are
+    enabled.  These are most probably "imap", "pop3", "lmtpunix".
+
+ 5. Edit /etc/imapd.conf, and make sure you have some admin users
+    listed in the entry "admins:".  I suggest using "cyrus" as your
+    admin.
+
+    I also suggest enabling plain text logins, and setting 
+    sasl_minimum_layer: 0
+
+    If you have unixhierarchysep enabled in imapd.conf, change all
+    "." in mailbox names mentioned on this document to "/", since Cyrus 
+    will use "/" as the hierarchy separator instead of the default ".".
+    I suggest you just leave unixhierarchysep set to false for now.
+
+ 6. Restart Cyrus  (/etc/init.d/cyrus2.2 restart)
+
+ 7. Use saslpasswd2 -c  to create an account for your admin:
+    saslpasswd2 -c cyrus
+
+ 8. Use sasldblistusers2 to make sure step 7 worked fine.
+
+ 9. Add other users to SASL likewise (saslpasswd2 -c).
+
+10. Log in cyrus as the administrator, and create the mailboxes:
+    cyradm --user cyrus localhost
+    cm user.bob
+    cm user.anna
+    cm user.clark...
+    ^D
+
+    (notice that there is an "user." in front of the mailbox name!)
+    You must use "user/bob", "user/anna" instead if you have the
+    unixhierarchysep option enabled in imapd.conf.
+
+    For this to work, you obviously need the cyrus-admin-2.2 package
+    installed.
+
+11. Try to login as a normal user, using imtest or a IMAP/POP3 client.
+    If you have trouble with mutt and CRAM-MD5 or DIGEST-MD5, edit
+    /etc/imapd.conf, and look for sasl_mech_list.  Set it to:
+    sasl_mech_list: plain cram-md5
+    (this will disable digest-md5, which causes trouble with mutt).
+
+12. Setup your MTA to deliver email inside Cyrus.  Basically that can
+    be done (easily) by:
+
+    a)  running /usr/sbin/cyrdeliver  (SLOW)
+        You need the lmtpunix service enabled in /etc/cyrus.conf for this
+	to work.
+    b)  delivering using LMTP to /var/run/cyrus/socket/lmtp
+        You need the lmtpunix service enabled in /etc/cyrus.conf for this
+	to work.
+
+	Just make sure (and use dpkg-statoverride to do that) that your
+	MTA can get to /var/run/cyrus/socket/lmtp.  It works just like any
+	file in a Unix system.
+
+    Cyrus REQUIRES a valid RFC2822 message, and will refuse messages with
+    bad headers (such as that From foobar header, notice the missing ':'),
+    embedded NULLs or any other crap.
+
+
+That's it.  See /usr/share/doc/cyrus-common-2.2/README.{postfix,exim,sendmail}
+for help on how to setup your MTA to correctly deliver to Cyrus.
+
+
+LDAP SETUP
+----------
+
+First, do the steps above and verify that your system is working fine.
+
+SASL is perfectly capable of trying various authentication methods one after
+another.  We will change our Cyrus setup for SASL to use a LDAP server lookup
+through saslauthd.
+
+1. Create the configuration for saslauthd to know what it must do:
+
+   Write the following file to /etc/saslauthd.conf:
+----CUTHERE----
+ldap_servers: ldap://127.0.0.1/
+ldap_version: 3
+ldap_timeout: 10
+ldap_time_limit: 10
+ldap_cache_ttl: 30
+ldap_cache_mem: 32768
+ldap_scope: sub
+ldap_search_base: ou=mail,o=mydomain
+ldap_auth_method: bind
+ldap_filter: maildrop=%u
+----CUTHERE----
+   And of course, edit it to fit your LDAP setup.
+
+2. Now, configure saslauthd to use LDAP mode and our config file:
+
+   Modify /etc/default/saslauthd so that it reads:
+   MECHANISMS="ldap"
+   PARAMS="-O /etc/saslauthd.conf"
+
+   (MECHANISMS can be a space-separated list of authentication
+   mechanisms. If you wanted saslauthd to try LDAP, then PAM, you
+   could use MECHANISMS="ldap pam")
+
+3. Start saslauthd
+
+   /etc/init.d/saslauthd restart
+
+4. Make sure Cyrus will be able to talk to saslauthd
+
+   Set the following options in /etc/imapd.conf:
+   sasl_mech_list: PLAIN
+   allowapop: no
+   allowplaintext: yes
+   sasl_minimum_layer: 0
+   sasl_pwcheck_method: saslauthd
+
+   And restart Cyrus.  You'd better understand that the above allows
+   plaintext logins over the network.  There is a LDAP SASL auxprop
+   plugin being worked on that might fix this issue.  As it stands
+   right now, you're better off by only accepting IMAPS (secure IMAP)
+   connections.
+
+   (sasl_pwcheck_method is a space separated list of SASL methods to
+   try.  If you want to have some local users in /etc/sasldb2, for
+   example, you could have "sasl_pwcheck_method: auxprop saslauthd"
+   and also "sasl_auxprop_plugin: sasldb")
+
+   One *extremely* important point to notice is that saslauthd works
+   ONLY with plaintext.  APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other
+   "auxprop" SASL mech will *not* work through saslauthd.
+
+5. That's it.  There is a LDAP auxprop module in the works which can deal
+   with APOP, CRAM-MD5, OTP, DIGEST-MD5 and so on, look for it in the SASL
+   docs and openldap's contrib stuff.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.debug
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.debug
@@ -0,0 +1,121 @@
+Cyrus IMAP for Debian, debugging procedures
+$Id: README.Debian.debug 229 2005-12-08 23:26:29Z astronut $
+-------------------------------------------
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+
+Cyrus has various levels of debugging aid, which can and should be used to
+offer more information about any problems you are facing with Cyrus.
+
+First, edit /etc/default/cyrus2.2, and set CYRUS_VERBOSE to a number higher
+than zero.  The higher the number, more debug information is provided. Numbers
+above 30 will cause Cyrus services to pause for 15s before executing (so that
+you can do something to it, such as attach strace or a debugger to the
+process).
+
+You can, and should use strace and ltrace to gather more information about what
+was happening to Cyrus when it malfunctioned.  straces are useful when
+networking or signal problems appear to be the issue, and ltraces can give
+hints on what the problem might be.
+
+If a Cyrus service is crashing and cyrmaster logs that the service is being
+killed by a signal, please use the debugging hooks to provide a back-trace
+using gdb (see below).  Back-traces are extremely useful when locating where
+Cyrus is dying, and why.
+
+Debugging information is sent to syslogd, using the DEBUG priority, facilities
+MAIL and DAEMON.
+
+You can also try to set MALLOC_CHECK_=2 in the environment, so that malloc()
+will cause Cyrus to dump core if it detects any sort of corruption.
+
+
+Telemetry logs
+--------------
+
+Cyrus will happily log all communications between the Cyrus store closed-box and
+the outside world.  These logs are sometimes vital to understand exactly what
+is happening and to reproduce bugs.
+
+To enable telemetry logging, create a directory under /var/lib/cyrus/log with
+the same name as the username for which you want the communication sessions to
+be logged.  Cyrus will log all imap, pop3, sieve and lmtp talks authenticated
+as that user (including proxied connections).  Make sure the directory is owned
+by user cyrus.
+
+Watch out for sensitive information such as passwords when you submit the
+telemetry logs to a public bug-tracking system or mailinglist.
+
+
+Recompiling Cyrus with debugging information
+--------------------------------------------
+
+In order to produce useful back-traces, or to interactively debug Cyrus,
+you must rebuild the package with debugging information.  It is quite
+easy to do so:
+
+1. Install all source dependencies to build the package (needs root):
+   apt-get install build-essential fakeroot
+   apt-get build-dep cyrus-imapd-2.2
+
+2. Download and rebuild Cyrus with debug information:
+   apt-get source cyrus-imapd-2.2
+   cd cyrus-imapd-2.2*
+   DEB_BUILD_OPTIONS=debug,noopt,nostrip dpkg-buildpackage -uc -us -rfakeroot
+
+3. Install the Cyrus packages with debug information (needs root):
+   cd ..
+   dpkg -i *deb     (or something like that)
+
+Now Cyrus should be working fine, using binaries with full debug information
+for gdb.  For interactive debugging, you may want to make sure there are no
+optimizations, in which case you should use "DEB_BUILD_OPTIONS=noopt,nostrip
+dpkg-buildpackage -uc -us -rfakeroot".
+
+Warning: the next time you run apt-get update, apt will probably download the
+non-debugging version of the Cyrus debs, and install them over the debugging
+packages.
+
+To install the non-debugging, optimized version of Cyrus over the debugging
+one, issue "apt-get --reinstall install (package)" commands for all the Cyrus
+packages you want replaced.
+
+
+Attaching debuggers to Cyrus, and getting traces
+------------------------------------------------
+
+You can tell Cyrus services to run a debugging command just before they
+start doing real work.  This can be used to run strace, ltrace and gdb
+or ddd (for interactive debugging and back-tracing) quite easily.
+
+Set the shell command to be run in /etc/imapd.conf, option debug_command.
+Then, add the command line switch "-D" to the Cyrus services you want to
+run the debug_command in /etc/cyrus.conf, and restart cyrmaster using
+/etc/init.d/cyrus2.2 restart.
+
+The debugging command must be given as a single line in the configuration file.
+
+To get a back-trace using gdb:
+debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/getbacktrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+
+The above will produce a back-trace of every service run with -D that segfaults
+in the files /tmp/gdb-backtrace.cyrus.*;  /usr/lib/cyrus/getbacktrace.gdb
+simply has the sequence of commands for gdb: c (to continue running the
+service), bt (to get the back-trace if the program didn't exit normally), quit
+(to quit gdb).
+
+For strace, you can use:
+debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce straces in /tmp/strace.cyrus.*
+
+For ltrace, you can use:
+debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce ltraces in /tmp/ltrace.cyrus.*
+
+Be warned that sensitive information such as passwords may be disclosed in the
+strace and ltrace output, so mangle them before sending such traces to public
+bug-tracking systems or mailing lists.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.postfix
+++ cyrus-imapd-2.2-2.2.13/debian/README.postfix
@@ -0,0 +1,143 @@
+Setting up Cyrus IMAPd for Postfix (Debian)
+$Id: README.postfix 229 2005-12-08 23:26:29Z astronut $
+===========================================================
+
+Cyrus works wonderfully well with Postfix, both in single-system stores (where
+Postfix runs in the same host as Cyrus IMAPd), and remote mail stores (where
+Cyrus IMAPd is in a different host than Postfix).
+
+Delivery to Cyrus should _always_ be done through direct LMTP from Postfix.  It
+is far simpler and faster to do such delivery using Unix sockets, but Unix
+sockets are only an option for single-system stores.  Cyrdeliver is just a
+stdio-to-LMTP proxy, and it slows down mail delivery greatly.
+
+Cyrus requires LMTP deliveries to be authenticated.  It assumes that any
+deliveries done through an Unix socket are trustable, and pre-authenticates
+them as if coming from the "postman" (fictitious) user (but you _can_
+re-authenticate them as another lmtp admin user, if you wish).
+
+Deliveries done through TCP sockets are not limited to the same host, unlike
+the Unix socket ones, and can therefore be used in remote mail stores.
+However, Cyrus requires that the LMTP session be authenticated using one of the
+SASL mechs available to Cyrus (you can switch this off by giving a "-a"
+parameter to lmtpd in cyrus.conf, but that is unsafe since anyone can bypass
+any user authentication controls you might have on mail delivery, that way).
+
+TCP-socket LMTP sessions should be authenticated as one of the Cyrus LMTP
+admins, normal Cyrus users are not enough.  This requires Postfix with SASL
+support.
+
+
+Setting up Postfix for LMTP delivery to Cyrus
+=============================================
+
+Just set up a transport (either using a transport map, or the default_transport
+configuration directive of Postfix).  Do not use cyrdeliver.
+
+I suggest that the lmtp transport be duplicated and renamed to cyrus if you
+use it to talk to anything else (such as amavisd-new, or amavis-ng). That
+way, LMTP connection caching to the Cyrus store gets optimized, and you can
+use the lmtp-named LMTP transport for something else.
+
+WARNING: Postfix 2.0 does not downcase the recipient in LMTP deliveries, so if
+your users require it, you will have to set lmtp_downcase_rcpt: yes in
+imapd.conf.
+
+
+Unix sockets:
+-------------
+
+For Unix sockets, the Postfix transport is specified as
+"lmtp:unix:/var/run/cyrus/socket/lmtp", (we are using the default Cyrus unix
+socket location as an example, you can change it in /etc/cyrus.conf and
+/etc/imapd.conf). 
+
+You need a Cyrus lmtpd service listening on that socket, of course, so make
+sure something like:
+
+lmtpunix        cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp"
+
+is in the SERVICES section of the /etc/cyrus.conf file.  You also need to make
+sure both Cyrus and Postfix can talk through that socket.  Unix sockets work
+just like files, so that translates to making sure both the user "cyrus" and
+the user Postfix is using for LMTP delivery can both read and write to that
+file.
+
+WARNING:  Since Cyrus pre-auths anything coming through the Unix socket, anyone
+who can write to it will be able to inject email into Cyrus directly.
+
+Use dpkg-statoverride to make sure your configuration for the socket
+permissions will not be overwritten by the Cyrus packages.  Do remember that
+Postfix usually runs the LMTP transport as user "postfix" (configurable in
+/etc/postfix/master.cf).  Also, do not run the postfix lmtp transport chrooted
+if the socket is not inside the chroot.
+
+1. Create a lmtp group:
+	# addgroup lmtp
+
+2. Put user postfix in that group:
+	# adduser postfix lmtp
+
+3. Fix the socket directory permissions:
+	# dpkg-statoverride --force --update --add \
+	  cyrus lmtp 750 /var/run/cyrus/socket
+
+4. Restart Postfix and Cyrus IMAPd
+	# /etc/init.d/postfix restart
+	# /etc/init.d/cyrus2.2 restart
+
+
+TCP sockets:
+------------
+
+TCP sockets are easier on the Cyrus side, and more complicated on the Postfix
+side.  For Cyrus, it is enough to have an "lmtpd" service listening on the
+desired IP interface (or in all of them, if you leave the interface unspecified
+as in the example below), that means something like this in /etc/cyrus.conf
+SERVICES area:
+
+lmtp            cmd="lmtpd" listen="lmtp"
+
+(do note that you MUST have an lmtp entry in /etc/services for this to work).
+
+Also, remember to set the tcpwrapper permissions up (/etc/hosts.allow and
+/etc/hosts.deny), or Cyrus might refuse the connections.
+
+To configure Postfix' lmtp transport to authenticate using SASL, do the
+following:
+
+1. Configure the lmtp transport SASL layer:
+   (add to /etc/postfix/main.cf):
+   lmtp_sasl_auth_enable = yes
+   lmtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+   lmtp_sasl_security_options = 
+   lmtp_destination_concurrency_limit = 100
+   lmtp_destination_recipient_limit = 0
+
+   The *_limit values should match whatever you configured as limits in
+   Cyrus.  The above configuration will allow plain text logins.
+
+   Create the password map /etc/postfix/sasl_passwd to tell postfix
+   of a Cyrus LMTP administrator user and password to use.
+
+   e.g.:
+   echo "mycyrusspool.my.domain.org postman:foobar" >sasl_passwd
+   postmap sasl_passwd
+
+2. Configure Cyrus to accept that user as a lmtp administrator
+   (add to /etc/imapd.conf)
+   lmtp_admins: postman
+
+3. Tell postfix to use the lmtp transport to deliver email using
+   transport maps or something else.  I suggest making a copy of the
+   postfix lmtp transport in master.cf, renaming it to "cyrus", and 
+   using that.
+
+4. Note that to use the new feature of virtual domains in Cyrus v2.2,
+   you need to tell postfix to use the lmtp transport as the 
+   virtual_transport. If you also want "local" mail recipients, i.e.
+   those that are addressed to hosts listed in mydestination, to
+   be delivered to Cyrus v2.2, you also need to use lmtp as the 
+   mailbox_transport.
+
+   That's it!
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.exim
+++ cyrus-imapd-2.2-2.2.13/debian/README.exim
@@ -0,0 +1,66 @@
+Setting up Cyrus IMAPd for Exim
+$Id: README.exim 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+This is very incomplete information, if you are an exim user, please send
+in a more complete document.
+
+
+General configuration hints (configuration examples assume you are using
+the Debian Exim4 configuration scheme and paths are relative to
+/etc/exim4):
+
+1. Use Exim version 4.  Exim version 3 just doesn't cut it in the lmtp
+   area, which is very important for performance when dealing with Cyrus
+   IMAPd.
+
+2. Use the LMTP transport to deliver using a unix socket (fastest), or 
+   the SMTP transport in LMTP mode to deliver over a TCP/IP socket.
+
+   For local delivery over a unix socket, add a file into conf.d/transports
+   with the following:
+
+   cyrus_delivery:
+      driver = lmtp
+      socket = /var/run/cyrus/socket/lmtp
+      batch_max = 20
+      user = mail
+
+   (set batch_max to whatever is best for your setup, and make sure you
+    allow enough Cyrus lmtp processes to serve that many lmtp connections)
+
+   If that doesn't work, I suggest you create a group for lmtp delivery,
+   add whichever user exim is running as to it, and use dpkg-statoverride
+   to make /var/run/cyrus/socket/lmtp writeable by that group.
+
+   To then deliver to Cyrus, you will need to comment check_local_user in
+   conf.d/router/900_exim4-config_local_user, and change the LOCAL_DELIVERY
+   macro in conf.d/main/01_exim4-config_listmacrosdefs to
+   LOCAL_DELIVERY=cyrus_delivery.
+
+   If you still want to deliver some messages to a mail spool then create
+   conf.d/router/899_exim4-config_copy_to_mbox and put this in it, changing
+   the local_parts as necessary:
+
+   copy_to_mbox:
+      debug_print = "R: copy_to_mbox for $local_part@$domain"
+      driver = accept
+      unseen
+      local_parts = postmaster
+      transport = mail_spool
+  
+   This will deliver postmaster mail to both cyrus and
+   /var/mail/postmaster.  You can comment the unseen option to have it only
+   deliver once to the mail_spool.  If you don't set check_local_user or
+   the user option the spool files will be owned by mail.
+
+3. Kill any NULs (ASCII 0x00) inside the message, if you don't want Cyrus
+   to bounce such malformed crap.  Calling "tr -d '\000'" as a filter might
+   do the trick.
+
+4. Sieve often needs to set -f option on /usr/sbin/sendmail when doing
+   redirects.  Exim allows only trusted_users to do this.  It is recommended
+   that you make sure "cyrus" is in the list of trusted_users in 
+   conf.d/main/02_exim4-config_options:
+   trusted_users = uucp:cyrus
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.dirs
@@ -0,0 +1 @@
+usr/bin
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.sendmail
+++ cyrus-imapd-2.2-2.2.13/debian/README.sendmail
@@ -0,0 +1,69 @@
+Setting up Cyrus IMAPd for Sendmail (Debian)
+$Id: README.sendmail 308 2006-03-07 20:02:36Z sven $
+===========================================================
+
+[This is user-contributed, unverified information]
+
+First, do *not* use the old cyrus*.m4 macros, they won't work well. The one
+you can use is cyrusv2.m4. There are many methods of connecting Cyrus to
+sendmail, and replacing the local mailer with Cyrus lmtpd is just one of
+them.
+
+Andrzej Filip <anfi@priv.onet.pl> says:
+http://anfi.homeunix.net/sendmail/localNalias.html
+   Cyrus Aliases
+   It allows to use user@CYRUS redirections in virtusertable,
+   aliases and .forward file e.g.  I use the following ~anfi/.forward:
+   anfi@CYRUS
+
+http://anfi.homeunix.net/sendmail/localtab.html
+   Local Table
+
+http://anfi.homeunix.net/sendmail/rtcyrus2.html
+   Real Time Cyrus Integration
+   It allows sendmail to check presence of cyrus mailbox in real time, 
+   sendmail rejects message to non existing cyrus mailboxes in reply to 
+   "RCPT TO:"
+
+
+I am not sure how well these will work with sieve.  The one report I have
+for Cyrus + sendmail with working sieve is:
+
+"cyrus/sieve vacation seems to work only if you integrate cyrus via
+cyrusv2.m4 into sendmail (8.12.3-4)."
+
+Sample sendmail.mc that seems to work:
+--------
+[...]
+dnl define BIND_OPTS',`-DNSRCH -DEFNAMES')dnl
+define(`confLOCAL_MAILER', `cyrusv2')dnl
+MAILER(`local')dnl
+MAILER(`smtp')dnl
+MAILER(`cyrusv2')dnl
+dnl MODIFY_MAILER_FLAGS(`cyrus',`+w')dnl
+
+LOCAL_RULE_0
+Rbb + $+ < @ $=w . >    $#cyrusbb $: $1
+[...]
+--------
+
+Here's a sieve test script you can try. Change it as needed for your
+site:
+
+require "fileinto";
+require "vacation";
+require "envelope";
+
+if header :contains "subject" "vactest" {
+         vacation :days 7 :addresses ["me@home.de"] "vactest!";
+}
+
+
+Pierre Gambarotto <pierre.gambarotto@enseeiht.fr> says:
+The minimum in order to make it work with sendmail is:
+
+define(`confLOCAL_MAILER', `cyrusv2')
+define(`CYRUSV2_MAILER_ARGS',`FILE /var/run/cyrus/socket/lmtp')
+MAILER(`cyrusv2')
+
+The CYRUSV2_MAILER_ARGS is the key.
--- cyrus-imapd-2.2-2.2.13.orig/debian/TODO.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/TODO.Debian
@@ -0,0 +1,68 @@
+Todo list
+---------
+
+$Id: TODO.Debian 317 2006-03-24 15:56:17Z hmh $
+
+CONFIRMED TODO FOR 2.2:
+o Cyrus 2.1 has alarm() lock breaking on lib/lock_fcntl().  This has
+  not been ported to 2.2 yet.  And it should not be ported until
+  #358742 is fixed. Note that if the user has to *kill* imapd to
+  unstick the lock, the issue is not in the alarm() code.
+
+
+EXTRA HIGH
+o master leaks memory when a service path is not null
+
+HIGH
+o Update copyright to my new template
+o Shout loudly if anything in .stage needs cleaning up
+o VERIFY SASL LEAKING CRAP TO prot_stream 
+	[info-cyrus  Re: Log messages going into imap/pop stream]
+o Revise rehash, it is busted...
+o Write nice shell wrapper for chk_cyrus and suggest a event to run it
+o Clean up script, that finds all crap over one day old in .stage
+  and delete it (after logging a warning). Add it as event.
+
+o https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1735
+
+MEDIUM
+o Verify kerberos build is still OK [gssapi]
+o Add switch to enable do-not-add-return-path-if-it-is-already-there to
+  deliver and LMTP input:
+   - Return-path:  Override (default: drop old return-paths, add ours)
+                   add (add if there isn't one in there already)
+  note that no return-path is NOT an option ;-)
+  Obs: - lmtpengine uses msg->return_path to know wether it got a mail from!
+       - dropping old return-paths is non-trivial
+o Reenable idled support (requires idled as a babysat service first)
+o Fulldir-hash detection using the same mech as db-backend
+o auth_ldap, and runtime-selection of auth backends. Add kerberos backend
+  and kerberos support while at it, as well. [ cyrus 2.2 only ]
+
+LOW
+o Verify alpha build logs, and fix the warnings
+o Better logcheck.ignore
+o verify section of libcyrus-*-perl, as well as the manpages'
+o Fix bogosity on perl manpages .TH
+o netsaint example of full monitoring (imap, pop, lmtp, master via snmp)
+o cyrus2-admin.menu
+o find and package snmp loggers for cyrus (as examples)
+o automated database backend conversion?
+o sanitize usernames and folders to lowercase, no spaces or ill. chars
+  [does this make any sense? shouldn't that be done by user name canon.?]
+
+WON'T DO
+o cyrus2-{pop3d,imapd} should deal with cyrus.conf
+  - not needed; cyrus deals gracefully with missing binaries
+o Debconf configuration
+  - too troublesome; lusers are not welcome to using cyrus
+    without reading docs anyway, and it is all SASL's fault.
+
+BACKBURNER IDEAS
+o master
+  - capabilities, so as to be able to bind to ports <1024
+  - jailing at user level (and what of shared mbx?)
+  - Better handling of fucked up children that refuse to start?
+    + requires 5th forked state in master
+o i18n (GNU gettext, with kerberos guard for logs, messages;
+  sanity-enforced txt files for return messages)
--- cyrus-imapd-2.2-2.2.13.orig/debian/UPGRADE.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/UPGRADE.Debian
@@ -0,0 +1,182 @@
+Upgrading cyrus-imapd to cyrus2-imapd on Debian
+(thanks to David D. Kilzer <ddkilzer@theracingworld.com> for this document)
+-----------------------------------------------
+
+For more information, see README.Debian[.gz] in /usr/share/doc/cyrus-common-2.2/
+and the web page below, part of the cyrus-utils project at SourceForge:
+
+  http://cyrus-utils.sourceforge.net/faq
+
+Upgrading from cyrus 2.1
+========================
+
+If you upgrade from cyrus 2.1, all you need to do is to upgrade the 
+database files from the old database backend to the new one. If you use 
+sieve-scripts, you will also need to use sievec on them. The information
+how to do upgrade your database files is contained in the upgrade
+information from cyrus v1.5 below. In a later version of this package,
+we will give more detailed information on upgrades.
+
+Upgrading sieve scripts
+-----------------------
+
+Cyrus IMAPD 2.2 uses bytecode for sieve scripts. This means that you need to
+compile all existing sieve scripts so that they will work with cyrus 2.2. There
+is a small tool in /usr/lib/cyrus/upgrade, called masssievec which will
+automatically compile all installed scripts when called correctly. Please 
+refer to the scripts usage information for details.
+The command line you will probably want to use is (as user cyrus):
+/usr/lib/cyrus/upgrade/masssievec /usr/lib/cyrus/bin/sievec /etc/imapd.conf
+
+Upgrading from cyrus 1.5.x
+==========================
+
+This document describes the procedure for upgrading from the old cyrus-imapd
+(v1.5.x) package to the new cyrus-imapd-2.2 (v2.2) package.  While this is a
+manual process, it is very straightforward.
+
+The procedure for converting a v1.6 cyrus store to v2.2 is not explained here,
+but the tools to convert the sieve scripts are in /usr/lib/cyrus/upgrade.
+
+Your SASL installation may require further conversion steps, as Cyrus v2.2 uses
+SASL v2, while Cyrus v1.5 used SASL v1.5.  /usr/share/doc/libsasl2 has more
+information on SASL v2.  Do pay attention to your SASL v2 installation, such
+as permissions and such.  When in doubt, read the README.simpleinstall
+document, as it describes an initial SASLv2 setup.
+
+NOTE: If you've already installed the cyrus 2.2 packages, skip to step 5.
+
+ 1. Become the "root" user on your local system.
+
+    $ /bin/su -
+    #
+
+ 2. Look for any running cyrus daemons using the ps(1) command.  Use
+    kill(1) to stop any processes that are found.
+
+    # /etc/init.d/pwcheck stop
+    # ps auwwx | grep cyr
+    # ps auwwx | grep pop3d
+    # ps auwwx | grep imapd
+    # ps auwwx | grep nntpd
+
+ 3. Remove the old cyrus packages.
+
+    ######################################################################
+    WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING
+    ######################################################################
+ 
+    Some versions of the cyrus-imapd packages, with versions 1.5.19-9.10
+    up to 1.5.19-20 (shipped in Debian Sarge 3.1r1) will entirely erase
+    the mail spool when purged with no questions asked.
+
+    You must NOT purge these packages before moving /var/lib/cyrus and
+    /var/spool/cyrus to somewhere safe.  Failure to do so will cause data
+    loss.
+
+    # mv /var/lib/cyrus /var/lib/old-cyrus
+    # mv /var/spool/cyrus /var/spool/old-cyrus
+
+    The cyrus-imapd packages in Woody (1.5.19-9.2) are safe, as well as
+    the fixed cyrus-imapd packages 1.5.19-20.1 which should make it to
+    Debian Sarge 3.1r2.
+
+    ######################################################################
+
+    # apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
+      cyrus-nntpd   [BUT SEE THE ABOVE WARNING FIRST!!!]
+
+    or use dselect/aptitude/synaptic/your favorite deb management tool.
+
+    IMPORTANT: You must answer "n" to this question:  "Do you want me to
+    remove the Cyrus mail and news spool (y/n) [n] ?"
+
+    NOTE: You could also copy -a the /var/spool/cyrus and /var/lib/cyrus
+    folders somewhere else, just in case.
+
+ 4. Install the new cyrus-imapd-2.2 packages. Make sure no user will try
+    to connect to imapd/pop3d and that no MTA will try to deliver to lmtpd
+    until you do step 5.
+
+    cyrus-common-2.2       [required]
+    cyrus-admin-2.2        [required]
+    cyrus-imapd-2.2        [optional; must have one of imapd or pop3d]
+    cyrus-pop3d-2.2        [optional; must have one of imapd or pop3d]
+    libcyrus-imap-perl22 [required]
+
+    # apt-get install PACKAGE-NAME [PACKAGE_NAME ...]
+
+    or use dselect.
+
+ 5. Stop the cyrmaster process.
+
+    # /etc/init.d/cyrus2.2 stop
+
+ 5a. Make sure Cyrus won't start until the upgrade process is over.
+
+    # cp -f /usr/lib/cyrus/upgrade/cyrus-db-types.upgrading_from_1.5.txt \
+            /usr/lib/cyrus/cyrus-db-types.active
+
+ 6. Change to the "cyrus" user.
+
+    # /bin/su - cyrus
+    $
+
+ 7. Run the rehash program.
+
+    $ /usr/lib/cyrus/upgrade/rehash basic
+
+ 8. Run ctl_mboxlist to update the "mailboxes" file.
+
+    $ cd /var/lib/cyrus
+    $ /usr/sbin/ctl_mboxlist -u < mailboxes
+
+ 9. Run the cyrreconstruct program from the /var/spool/cyrus directory
+    to reconstruct the mailboxes.
+
+    $ cd /var/spool/cyrus
+    $ /usr/sbin/cyrreconstruct -r user.*
+
+    (you may need to cyrreconstruct other mailboxes, if you have any
+    system mailboxes or shared mailboxes not in the user hierarchy)
+
+10. Exit the "cyrus" user, back to "root".
+
+    $ exit
+    #
+
+11. Upgrade all of the db2 files used by Cyrus from to db4.2.
+
+    # find /var/lib/cyrus -name \*.db -print -exec /usr/bin/db4.2_upgrade {} \;
+
+12. Convert the state databases to those used by new Cyrus 2.2
+
+    Read /usr/share/doc/cyrus-common-2.2/README.Debian.database, and follow
+    whatever steps you need to change the backends from db3 to skiplist.
+
+    This step needs some work, if you can send your experiences with it
+    to hmh@debian.org, I will update this document accordingly.
+
+**** The upgrade of Cyrus' stores are now complete ****
+
+You may want to remove any left-over empty directories from the old version,
+and re-run /usr/sbin/cyrus-makedirs just in case you got one of them wrong.
+
+Now, you need to reconfigure the new Cyrus imapd to adequate it to your system
+and SASL requirements. The Cyrus config files are /etc/imapd.conf,
+/etc/cyrus.conf and /etc/default/cyrus2.2.
+
+Depending on your SASL configuration, you may also need to modify
+/etc/pam.d/{imap,pop,sieve,lmtp} and other SASL configuration files.
+
+Do not forget to edit /etc/imapd.conf to e.g. set the "admins: cyrus" line (if
+you use "cyrus" as the name for the administrator).
+
+NOTES about DRAC authentication
+===============================
+
+DRAC has been disabled in cyrus-imapd-2.2, it caused quite some trouble and
+wasn't used by many. You can however build your own version by editing 00list
+in debian/patches and adding 20-drac_auth.dpatch to it at the proper place 
+(i.e. right before the patch numbered 21) and building cyrus-imapd-2.2 with
+dpkg-buildpackage or a similar tool.
--- cyrus-imapd-2.2-2.2.13.orig/debian/arbitronsort.8
+++ cyrus-imapd-2.2-2.2.13/debian/arbitronsort.8
@@ -0,0 +1,15 @@
+.TH ARBITRONSORT "8" "Project Cyrus" "CMU"
+.SH NAME
+arbitronsort \- sorts arbitron(8) output
+.SH SYNOPSIS
+.B 
+arbitronsort
+.SH DESCRIPTION
+.PP
+This tool takes the output of arbitron (run without the -o option)
+on stdin and prints out first a ranking of mailboxes by number of 
+people who selected the mailbox, and then a ranking of mailbox by
+number of subscribers.
+.SH SEE ALSO
+.PP
+\fBarbitron(8)\fR
--- cyrus-imapd-2.2-2.2.13.orig/debian/changelog
+++ cyrus-imapd-2.2-2.2.13/debian/changelog
@@ -0,0 +1,320 @@
+cyrus-imapd-2.2 (2.2.13-4ubuntu1.1) edgy-updates; urgency=low
+
+  * Upload to -updates.
+  * Testing done by Steve Kowalik, Daniel Givens and helder@paxjulia.com.
+  * LP: #67111
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sun, 29 Apr 2007 17:11:43 +1000
+
+cyrus-imapd-2.2 (2.2.13-4ubuntu1.1~proposed1) edgy-proposed; urgency=low
+
+  * Patch configure directly to not look for db4.4. This is ugly and brutal,
+    but fixes the problem, and neatly keeps the debdiff small as well.
+    (LP: #67111)
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 23 Feb 2007 22:57:08 +1100
+
+cyrus-imapd-2.2 (2.2.13-4ubuntu1) edgy; urgency=low
+
+  * Synchronize with Debian unstable.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 11 Jul 2006 18:51:39 +0200
+
+cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Switch from dh_movefiles (deprecated) to dh_install
+
+  [ Sven Mueller ]
+  * Integrate 4 upstream CVS updates/fixes:
+    - Upstream fix: only free() the backend struct if we allocated it
+      (don't free cached connections)
+    - remove limit on the size of mailbox files that can be received by UNDUMP
+      (write file directly to disk rather than reading the literal into
+      memory)
+    - better logging to facilitate message tracking (Wes Craig
+      <wes@umich.edu>)
+    - remove redundant check for wildcards in mailbox names (Wes Craig
+      <wes@umich.edu>)
+  * Move expiry from ctl_deliver to cyr_expire as suggested by upstreams
+    upgrade information.
+  * Add upstream patch to fix a small issue with linking and libRSAglue
+  * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
+    <guenther@sendmail.com>)
+  * Add upstream patch to allow reporting of mailbox sizes above 4GB
+  * Add upstream patch to fix a documentation error in imapoptions
+  * Add patch to fix some compiler warnings about casts from pointer to
+    integer of different size
+  * Change the init script to actuall print some information when called with
+    the "status" argument
+  * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for
+    reference to upstream CVS
+
+  [ Benjamin Seidenberg ]
+  * Fix typos in UPGRADE.Debian (Closes: #368675)
+  * Fix link in doc/html/readme.html (Closes: #368676)
+  * Add upstream patch to fix POP locking when reconstructing
+
+ -- Sven Mueller <sven@debian.org>  Wed, 28 Jun 2006 22:21:51 +0200
+
+cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
+
+  [ Sven Mueller ]
+  * [Security] Add upstream patch to disallow user probes
+  * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
+  * Add upstream patch to allow ACL removal for invalid IDs
+  * Add upstream patch to properly handle timezones and DST in fetchnews
+  * Urgency=high for both security fix and patch to dump/undump bug which
+    makes package unusuable in many supported setups
+
+  [ Benjamin Seidenberg ]
+  * Add build dependency on libkvm-dev for kfreebsd (Closes: #366113)
+
+ -- Sven Mueller <debian@incase.de>  Fri,  5 May 2006 18:01:41 +0200
+
+cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Apply fix from upstream CVS to imap/backend.c (Closes: #365629) 
+
+ -- Sven Mueller <debian@incase.de>  Tue,  2 May 2006 22:14:03 +0200
+
+cyrus-imapd-2.2 (2.2.13-1) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Switch to new upstream release (2.2.13)
+  * Fix spelling mistake in debian/control (Closes: #363329)
+  * Fix logcheck rule (Closes: #364835)
+
+ -- Sven Mueller <debian@incase.de>  Sat, 29 Apr 2006 22:31:42 +0200
+
+cyrus-imapd-2.2 (2.2.12-5) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add example entries for squatter to cyrus.conf (Closes: #355303)
+  * Fix URLs in README.sendmail (Closes: #355771)
+  * Remove STDERR redirection from cyrus-common-2.2 postinst call to adduser
+
+  [ Benjamin Seidenberg ]
+  * Default to lmtp_downcase_rcpt: yes for compliance with RFC 2821
+    (Closes: #357040)
+
+ -- Sven Mueller <debian@incase.de>  Fri, 31 Mar 2006 20:11:54 +0200
+
+cyrus-imapd-2.2 (2.2.12-4ubuntu1) dapper; urgency=low
+
+  * Synchronize with Debian unstable.
+  [ Taken from the cyrus21-imapd package ]
+  * Switch default config to use ssl-cert-snakeoil certificates only for the
+    global entry. Maintain the other examples to keep more clear how it works.
+  * Add Depends on ssl-cert.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Feb 2006 00:28:45 +0000
+
+cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Change maintainer to mailing list
+  * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240)
+  * Add lintian override for CVS dirs in source tarball, we need to hit
+    upstream with a cluebat for this.
+  * Move all Build-Depends-Indep dependencies to Build-Depends because of the
+    way debian/rules invokes this target, they are not installed, fixes FTBFS.
+    (Closes: #352775, #352779)
+
+  [ Sven Mueller ]
+  * Disable DRAC authentication
+  * Fix reference in debian/po/POTFILES.in (Closes: #352948)
+
+  [ Ondřej Surý ]
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 15 Feb 2006 22:42:35 +0100
+
+cyrus-imapd-2.2 (2.2.12-3ubuntu1) dapper; urgency=low
+
+  * Build using Berkeley DB 4.3.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Feb 2006 17:40:07 +0000
+
+cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add a script which helps downloading, editing and re-uploading
+    sieve scripts
+  * Add a patch to fix db_err callback prototype when building against
+    Berkeley DB 4.3 or newer
+
+  [ Henrique de Moraes Holschuh ]
+  * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge,
+    which would cause data loss when UPGRADE.Debian instructions were
+    followed.
+
+  [ Benjamin Seidenberg ]
+  * Changed debian/control so that the doc package is in section doc to match
+    ftpmaster override.
+
+  [ Ondřej Surý ]
+  * Updated and renamed logcheck rules.
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 13 Feb 2006 14:16:44 +0100
+
+cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * Modify the Debian default TLS cipher list to use only secure ciphers
+    suitable for imap/pop/smtp/lmtp TLS, and add an explanation
+
+  [ Benjamin Seidenberg ]
+  * Rewrote descriptions to all refer to cyrus-common-2.2
+  * Changed all package names in all required files within /debian to reflect
+    the new naming scheme
+  * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that
+    this folder is deleted correctly
+  * Changed policy version to 3.6.2
+  * Added upstream patchset 6662:
+    imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
+    (Closes: #342314)
+
+  [ Sven Mueller ]
+  * Add a small sed call to debian rules to work around libsnmp[59]-dev
+    problem which causes an unneccesary "-lsensors" in master/Makefile,
+    resulting in an unnessary build dependency on libsensors-dev.
+    Proper fix has to go into netsmp packages, also we need to properly use
+    Debian's libtool. (Closes: #341580)
+  * Add czech translation (thanks to Martin Sin and the debian-l10n-czech
+    team) with a spelling correction from Ondrej SurĂ˝.
+  * Adjust kolab2 annotation patch according to patch from Steffen Joeris
+    (Closes: #347527)
+  * Apply patch fixing some error messages in Shell.pm (Closes: #347658)
+
+  [ Ondřej Surý ]
+  * Upload to experimental.
+
+ -- Ondřej Surý <ondrej@debian.org>  Fri, 13 Jan 2006 11:52:58 +0100
+
+cyrus22-imapd (2.2.12-1) experimental; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Revised to build against pristine upstream sources.
+  [ Sven Mueller ]
+  * Fixed a discrepancy between documentation and actual behaviour of the
+    "dracinterval" imapd.conf option. Documentation always said the default
+    would be 0, while the default was actually 5.
+  [ Henrique de Moraes Holschuh ]
+  * Change build-dependency from libsnmp4.2-dev (ucd snmp) to libsnmp9-dev |
+    libsnmp5-dev (netsnmp), so that it works right in sid/etch and sarge
+  * Upload to experimental
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 29 Nov 2005 02:10:21 -0200
+
+cyrus22-imapd (2.2.12-0.9) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add patch to be compatible with BerkeleyDB 4.3
+  * Add patch to fix TLS/SSL shutdown in timsieved
+
+ -- Sven Mueller <debian@incase.de>  Mon, 14 Nov 2005 14:56:20 +0100
+
+cyrus22-imapd (2.2.12-0.8) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Fix a problem in the init scripts new status check, found by Benjamin
+    Seidenberg.
+
+ -- Sven Mueller <debian@incase.de>  Sun, 13 Nov 2005 20:14:05 +0100
+
+cyrus22-imapd (2.2.12-0.7) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Switch most deletions of autogenerated files to use debian/deletable.files
+  * Switch all remaining patches to dpatch so that the .diff.gz should now be
+    clean except for the files in debian/.
+
+ -- Sven Mueller <debian@incase.de>  Thu, 10 Nov 2005 16:06:09 +0100
+
+cyrus22-imapd (2.2.12-0.6) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Added kolab2 annotation patch as proposed by Christoper Sacca
+  * Added a small patch to lower the minimum pop3 timeout to 1 minute.
+    The default is still at 10 minutes. I also added some documentation to make
+    it clear to admins that it is _not_ recommended to lower the value to less
+    than 10 minutes (because that is what the standard says it should be at).
+    I needed this change for use at my workplace though. The patch is disabled
+    by default.
+  * Patched init script to support everything LSB 3.0 asks for, including the
+    "right" return codes, as far as we can.
+  * Add patch to enhance sieveshell a bit:
+    - Add --execfile parameter to read commands from a file
+    - Add --password parameter to pass the users parameter on the commandline
+    - Add code to return with a non-zero exit code if the last command
+      executed failed for some reason.
+
+  [ Ondřej Surý ]
+  * Add 64bit quota dpatch.
+  * Rerun autoconf and add result as dpatch. 
+
+ -- Sven Mueller <debian@incase.de>  Fri, 23 Sep 2005 18:55:57 +0200
+
+cyrus22-imapd (2.2.12-0.5) unstable; urgency=low
+
+  * Update upgrading information
+  * Include masssievec in cyrus22-common
+  * Applied patch from Raphaël 'SurcouF' Bordet <surcouf@debianfr.net> to add
+    nntp support again.
+  * Eliminate an unused variable from tools/masssievec to get rid of perl
+    warning.
+  * Update Recommends and Suggests for cyrus22-common as suggested by HMH
+  * Move several patches from patching the source directly to patching through
+    the use of dpatch
+
+ -- Sven Mueller <debian@incase.de>  Tue, 24 May 2005 23:13:18 +0200
+
+cyrus22-imapd (2.2.12-0.4) unstable; urgency=low
+
+  * Fix usage message in deliver.c to reflect Debian naming of (cyr)deliver,
+    (cyr)quota and (cyr)reconstruct
+  * Document the defaultdomain setting a bit better (hopefully)
+  * fix deletion of debian/cyrus-hardwired-config.txt during cleanup
+  * build both arch-dependend and arch-independend parts when debian/rules is
+    called for the build target
+  * Add Sven Mueller to the list of uploaders
+
+ -- Sven Mueller <debian@incase.de>  Fri, 29 Apr 2005 00:14:04 +0200
+
+cyrus22-imapd (2.2.12-0.3) unstable; urgency=low
+
+  * Add a README which contains the configure options used to
+    compile the package. The README is auto-generated by debian/rules
+  * cyrus22-clients needs to conflict with cyrus21-clients
+  * cyrus22-common needs to conflict with cyrus21-common 
+  * Add a guess of what the problem might be to the set_cert_stuff failure
+    message
+  * Update a few Replaces:, Provides: and Conflicts: lines in debian/control
+
+ -- Sven Mueller <debian@incase.de>  Thu, 24 Mar 2005 12:26:27 +0100
+
+cyrus22-imapd (2.2.12-0.2) unstable; urgency=low
+
+  * Fix some more perl executable paths
+  * clean up debian directory a bit
+  * install sievec with cyrus22-common
+  * install mbexamine with cyrus22-common
+  * install smmapd with cyrus22-common
+  * install cyr_expire with cyrus22-common
+  * install installsieve with cyrus22-admin
+
+ -- Sven Mueller <debian@incase.de>  Tue, 22 Mar 2005 14:48:33 +0100
+
+cyrus22-imapd (2.2.12-0.1) unstable; urgency=low
+
+  * Initial revision of cyrus22-imapd package
+    - debian packaging taken from cyrus21-imapd_2.1.18-1
+  * Add/fix imapd.conf info regarding virtual domains
+  * Add DRAC support (i.e. apply DRAC patch from /contrib)
+  * Add syncldap2cyrus.pl script from #260833 (a cyrus21 bug)
+
+ -- Sven Mueller <debian@incase.de>  Fri, 18 Mar 2005 13:34:09 +0100
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/compat
+++ cyrus-imapd-2.2-2.2.13/debian/compat
@@ -0,0 +1 @@
+4
--- cyrus-imapd-2.2-2.2.13.orig/debian/control
+++ cyrus-imapd-2.2-2.2.13/debian/control
@@ -0,0 +1,177 @@
+Source: cyrus-imapd-2.2
+Section: mail
+Priority: extra
+Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org>
+Uploaders: Henrique de Moraes Holschuh <hmh@debian.org>, Sven Mueller <sven@debian.org>, Benjamin Seidenberg <astronut@dlgeek.net>, Ondřej Surý <ondrej@debian.org>
+Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.3-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], ssl-cert (>= 1.0-11ubuntu1)
+
+Package: cyrus-common-2.2
+Architecture: any
+Section: mail
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2
+Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35)
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common
+Replaces: cyrus21-common, cyrus22-common
+Provides: cyrus21-common, cyrus22-common
+Description: Cyrus mail system (common files)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+  o Designed to handle massive quantities of mail
+  o No need for users to have login accounts
+  o Virtual domain support
+  o Support for POP3 in addition to IMAP
+  o Sieve server-side email filtering
+  o Servers don't run as root
+  o Easy support for mail quotas
+  o SSL support, including secure IMAP
+  o DRAC support for pop/imap-before-smtp
+  o IPv6 support
+  o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your 
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains the common files needed by the other Cyrus
+ components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed
+ to enable IMAP and POP3 support respectively. cyrus22-murder can be
+ used to enable IMAP, POP3 and LMTP proxying.
+
+Package: cyrus-doc-2.2
+Architecture: all
+Section: doc
+Provides: cyrus21-doc, cyrus22-doc
+Replaces: cyrus21-doc, cyrus22-doc
+Conflicts: cyrus21-doc, cyrus22-doc
+Description: Cyrus mail system (documentation files)
+ This package contains the documentation for the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: cyrus-imapd-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Provides: imap-server, cyrus21-imapd, cyrus22-imapd
+Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd
+Replaces: cyrus21-imapd, cyrus22-imapd
+Description: Cyrus mail system (IMAP support)
+ This package contains the IMAP (Internet Mail Access  Protocol) portion
+ of the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
+
+Package: cyrus-pop3d-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server
+Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server
+Replaces: cyrus21-pop3d, cyrus22-pop3d
+Description: Cyrus mail system (POP3 support)
+ This package contains the POP3 (Post Office Protocol) portion of the Cyrus
+ IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: cyrus-admin-2.2
+Architecture: all
+Section: mail
+Depends: libcyrus-imap-perl22 (>= ${Source-Version})
+Suggests: sasl2-bin
+Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin
+Replaces: cyrus21-admin, cyrus22-admin
+Provides: cyrus21-admin, cyrus22-admin
+Description: Cyrus mail system (administration tools)
+ This package provides the administrative tools for the Cyrus IMAPd suite.
+ It contains the cyradm tool which can be used to administer 
+ both local and remote Cyrus mail systems.  It also contains sieveshell
+ and its deprecated cousin installsieve, which can be used to manage
+ sieve scripts.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: cyrus-murder-2.2
+Section: mail
+Architecture: any
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Recommends: cyrus-imapd-2.2 (= ${Source-Version}), cyrus-pop3d-2.2 (= ${Source-Version})
+Conflicts: cyrus21-murder, cyrus22-murder
+Replaces: cyrus21-murder, cyrus22-murder
+Provides: cyrus21-murder, cyrus22-murder
+Description: Cyrus mail system (proxies and aggregator)
+ This package contains the Cyrus IMAPd suite murder aggregator system,
+ i.e. IMAP, POP3  and LMTP proxies, and the mupdate mailbox master daemon.
+ It allows for cluster setups where there are many backend Cyrus spools and
+ frontend proxy servers.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
+
+Package: cyrus-nntpd-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: news-transport-system
+Replaces: cyrus21-nntpd, cyrus22-nntpd
+Provides: news-transport-system, cyrus21-nntpd, cyrus22-nntpd
+Description: Cyrus mail system (NNTP support)
+ This package contains the NNTP (Network News Transfer Protocol) portion of
+ the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+ 
+Package: cyrus-clients-2.2
+Architecture: any
+Section: mail
+Depends: ${shlibs:Depends}
+Conflicts: cyrus21-clients, cyrus22-clients
+Provides: cyrus21-clients, cyrus22-clients
+Replaces: cyrus21-clients, cyrus22-clients
+Description: Cyrus mail system (test clients)
+ This package contains client tools to test the Cyrus IMAPd suite.
+ It contains the mupdatetest, sivtest, smtptest, lmtptest,
+ imtest and pop3test tools which can be used to interactively talk to 
+ a mupdate, sieve, smtp, lmtp, imap or pop3 server.
+ The clients are fully SASL-enabled for authentication.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
+
+Package: cyrus-dev-2.2
+Architecture: any
+Section: devel
+Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus-common-2.2 (= ${Source-Version}), libsasl2-dev (>= 2.1.9)
+Conflicts: cyrus-dev, cyrus21-dev, cyrus22-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
+Replaces: cyrus21-dev, cyrus22-dev
+Provides: cyrus21-dev, cyrus22-dev
+Description: Cyrus mail system (developer files)
+ This package contains header files and the static library needed 
+ to develop IMAP applications that interface with the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
+
+Package: libcyrus-imap-perl22
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs:Depends}
+Provides: libcyrus-imap-perl, libcyrus-imap-perl21
+Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
+Replaces: libcyrus-imap-perl21
+Section: perl
+Description: Interface to Cyrus imap client imclient library
+ The Cyrus::IMAP module provides an interface to the Cyrus imclient
+ library.  These are primarily useful for implementing cyradm operations
+ within a Perl script; there are easier ways to implement general client
+ operations, although they may be more limited in terms of authentication
+ options when talking to a Cyrus imapd.
+ .
+ The modules that compose Cyrus::SIEVE are also included, but they are
+ undocumented upstream.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
--- cyrus-imapd-2.2-2.2.13.orig/debian/copyright
+++ cyrus-imapd-2.2-2.2.13/debian/copyright
@@ -0,0 +1,75 @@
+$Id: copyright 210 2005-11-23 16:29:59Z astronut $
+
+This package was debianized by Henrique de Moraes Holschuh <hmh@debian.org> on
+Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
+<mj@debian.org> and David Parker <david@neongoat.com>.
+
+The Debian packaging of Cyrus IMAPd v2.2 is:
+  Copyright (c) 2002-2004 by Henrique de Moraes Holschuh <hmh@debian.org>,
+  			     Sven Mueller <debian@incase.de>,
+			     Benjamin Seidenberg <astronut@dlgeek.net>
+  and distributed in the same license as the upstream source it applies to.
+
+Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
+
+Upstream Author: Carnegie Mellon University <cyrus-bugs+@andrew.cmu.edu>
+Upstream bugs:   http://bugzilla.andrew.cmu.edu/
+
+Patches: 
+The Debian version of Cyrus IMAP is heavily patched to adequate it to Debian,
+and sometimes to add functionality.  All such patches are submitted upstream to
+CMU, for proper inclusion in Cyrus -- but not all of them will be accepted, of
+course.  See README.Debian for more details.  Also, many patches from the
+current CVS release of Cyrus IMAPd are folded in Debian updates; these are
+identified by "patchset" numbers, created by the cvsps utility.
+
+The IPv6 patch by Hajimu UMEMOTO <ume@mahoroba.org> has been applied.
+
+CMU release tarballs are often repacked minus the CVS/ directories to avoid
+problems in my build system.
+
+Copyright:
+ALL versions of the Cyrus IMAP server are now covered by the
+following copyright notice:
+
+ * Copyright (c) 1994-2000 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+For more information, see http://asg.web.cmu.edu/cyrus/imapd/license.html
+(local copy stored in /usr/share/doc/cyrus2-common/license.html)
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-16x16.xpm
+++ cyrus-imapd-2.2-2.2.13/debian/cyradm-16x16.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"22111;1212211111",
+"211221213<121221",
+"2111212232<11122",
+"121121221<231<11",
+"2112232<34334112",
+"1112222243213212",
+";2221<11*&<<*<<1",
+"1221233323232231",
+"2233223333332&1<",
+"2213123333233*1*",
+"123312121222233*",
+"1233212<<213223<",
+"12331<1<<11<123*",
+"123333322222223*",
+"123223322222323*",
+"2<&%%%X%%%%X%%X%"
+};
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-32x32.xpm
+++ cyrus-imapd-2.2-2.2.13/debian/cyradm-32x32.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"222111112;2112121222111112112121",
+"121112;2112211223+11212111121111",
+"221112222112111333+221121221112;",
+"2112111211222133333&12222;212222",
+"11111112212122333323$221+2121211",
+"212121112122333%3 332&41%1111121",
+";212112;22132233211%44443&112211",
+"2211222222233.3112344444442112;2",
+"11111211133321114444441444%22121",
+"1212222133311 444444*%4444%22212",
+"211112233111444444:4334%444%2111",
+";11222331 433223* 2332%322231112",
+"222213&&11&*&&%#%%# %&#%  #%&221",
+"12233343434444434444344444443311",
+"113&2&&&3333333333333332222333+2",
+"2133333333333333332333232X**23%o",
+"22344333333333232233222221#*24.%",
+"124#&34#&#333333333223323:.#24.%",
+"223333333333333333322332332224.%",
+"214333333323333323322222322224.X",
+"11333333 &23X&2&&3223223222234.X",
+"123334433333333333222232223234.%",
+"12333333&2X12X& &13X2322322134.%",
+"123333333233333332333222222224.X",
+"21333332&&&1&X2 3&&3X&&X222234.X",
+"213333333333323222222222222134.%",
+"123333333333332223322322222134.X",
+"113333233233232332232222322324.X",
+"223334434434444444434434444444.%",
+"12 .     .                    .X",
+"2112%%%%o%%X%%o%X%%%o%X%X%oXXo%%",
+"11121222122212122122122122222222"
+};
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrdump.8
+++ cyrus-imapd-2.2-2.2.13/debian/cyrdump.8
@@ -0,0 +1,16 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH CYRDUMP "8" "Project Cyrus" "CMU"
+.SH NAME
+cyrdump \- dump mailboxes to stdout
+.SH SYNOPSIS
+.B 
+cyrdump [-C <configfile>] [-v] [mboxpattern ...]
+.SH DESCRIPTION
+.PP
+A tool for dumping IMAP mailboxes on a server.
+.TP
+\fB\-C <configfile>\fR
+Specify an alternate configuration file ( is used by default)
+.TP
+\fB\-v\fR
+Increase program verbosity.
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.default
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default
@@ -0,0 +1,30 @@
+# Defaults for Cyrus IMAPd 2.2 scripts
+# $Id: cyrus-common-2.2.cyrus2.2.default 229 2005-12-08 23:26:29Z astronut $
+# sourced by /etc/init.d/cyrus2.2, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus2.2 by the maintainer scripts
+#
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set this to 1 or higher to enable debugging on cyrmaster
+#CYRUS_VERBOSE=1
+
+# Socket listen queue backlog size
+# See listen(2). Default is 32, you may want to increase
+# this number if you have a very high connection rate
+#LISTENQUEUE=32
+
+# Wether cyrus-makedirs should optimize filesystems
+# or not.  Switch it off if you are going to do your
+# own optimizations.  Set to 1 to enable, 0 to disable
+#CYRUSOPTFILESYS=1
+
+# The default Cyrus IMAP config file that the scripts should
+# use.  You better know what you're doing if you change this
+#CONF=/etc/imapd.conf
+
+# Check spool condition with chk_cyrus on daily cronjob
+# Set to 1 to enable, default is disabled
+#CHKCYRUS=0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.README.Debian
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, admin utilities
+$Id: cyrus-admin-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+---------------------
+
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.install
@@ -0,0 +1,4 @@
+usr/bin/cyradm
+usr/bin/sieveshell
+usr/bin/installsieve
+usr/share/icons/*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.linda
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.linda
@@ -0,0 +1,2 @@
+Tag: interp-minus-n-fails
+Data: usr/bin/cyradm
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.lintian
@@ -0,0 +1 @@
+cyrus-admin-2.2: shell-script-fails-syntax-check ./usr/bin/cyradm
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.manpages
@@ -0,0 +1,3 @@
+man/sieveshell.1
+perl/imap/blib/man1/cyradm.1p
+debian/tmp/usr/share/man/man1/installsieve.1
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.menu
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.menu
@@ -0,0 +1,6 @@
+?package(cyrus-admin-2.2):needs="text" section="Apps/System/Admin"\
+	hints="Mail,Admin,Cyrus"\
+	title="Cyrus 2.2 cyradm (cyrus@localhost)"\
+	longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\
+	icon="/usr/share/icons/cyradm.xpm"\
+	command="/usr/bin/cyradm --user cyrus localhost"
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.README.Debian
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, generic SASL-enabled protocol clients
+$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+---------------------
+
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.dirs
@@ -0,0 +1 @@
+usr/bin
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.manpages
@@ -0,0 +1 @@
+man/*test.1
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.NEWS
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.NEWS
@@ -0,0 +1,86 @@
+cyrus22-imapd (2.2.12-1) unstable; urgency=low
+
+ cyrus now supports realms by default and is therefor suitable for virtual
+ domains much better than it was before. However, this might break upgrades
+ from v2.1 installations, especially when the hostname might change during
+ operation (for example in hot-standby high-Availability setups). 
+
+ This is the first cyrus22 package
+
+ -- Sven Mueller <debian@incase.de>  Sun, 13 Feb 2005 00:49:12 -0100
+ 
+cyrus21-imapd (2.1.16-1) unstable; urgency=low
+
+ ipurge behaviour is now that of the patch accepted upstream.  It uses the
+ date: header by default, and it can use the internal date of the message as
+ an alternative.
+
+ Cyrus 2.1 is officially in maintenance mode now, and the Debian packages will
+ follow suit.  I will switch development efforts to the Cyrus 2.2 package, and
+ update 2.1 only to fix bugs, and apply anything that shows up on CVS.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 23 Nov 2003 11:59:12 -0200
+
+cyrus21-imapd (2.1.15-8) unstable; urgency=low
+
+ ipurge has been patched in a way that changes its default behaviour.  Now, it
+ uses the internal date of the message (i.e. when it entered the mail store,
+ be it through lmtp or imap append) instead of the Date: header for date
+ comparasions.
+
+ The old behaviour is still available, refer to the ipurge manpage for more
+ information.
+
+ These changes have not been accepted upstream yet, so I don't promise they
+ will stay around forever.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 21 Oct 2003 13:18:30 -0200
+
+cyrus21-imapd (2.1.15-1) unstable; urgency=low
+
+ Cyrus has a big bug regarding EOL markers for /usr/sbin/sendmail.  It sends
+ CRLF-terminated lines to the /usr/sbin/sendmail wrapper (or to whatever you
+ configure for sendmail: in /etc/imapd.conf), when it should be sending
+ LF-terminated lines only.
+
+ Postfix and sendmail are fine with CRLF EOLs.  Exim 4 can be configured
+ to strip the CRs off all the time in its configuration file.
+
+ I am writing a patch to allow one to configure parameters for sendmail, but
+ while it is not ready and accepted upstream, users of Exim 3 should set 
+ their sendmail: in imapd.conf to a shell wrapper that calls 
+ /usr/sbin/sendmail -dropcr "$@" or something to that extent.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 19 Aug 2003 07:40:40 -0300
+
+cyrus21-imapd (2.1.14-1) unstable; urgency=low
+
+ Initial instance of NEWS.Debian support.  This file will be used to note all
+ changes the local admin must do to a Cyrus system when upgrading.
+
+ Upgrading checklist for recent 2.1.x packages:
+
+ 1. timsieved was corrected to behave properly in the altnamespace
+    configuration.  However, this means that it was previously looking for
+    sieve scripts in "user.name" format instead of the (correct) "user^name"
+    format.  A sample script to do this (which should be run in the top level
+    of the sieve directories) is in /usr/lib/cyrus/upgrade/convert-sieve.pl.
+    Note that this is only needed if you are running with altnamespace turned
+    on.
+
+ 2. We are now more forgiving of MIME boundry headers generated by earlier
+    versions of eudora by default (you can switch to the more strict checks
+    that used to be the default using the rfc2046_strict imapd.conf(5)
+    option. 
+    
+    However, if you have messages already in the mailstore that you want to
+    fix you will need to reconstruct the affected mailboxes to regenerate
+    the cached bodystructure data to take this into account.  Nothing needs
+    to be done for new messages to be treated in this way.
+
+
+ Upgrading checklist for old Cyrus 1.5 or 1.6:
+ 
+    Read /usr/share/doc/cyrus21-common/UPGRADE.Debian.gz
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri,  4 Jul 2003 10:10:53 -0300
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.contrib
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.contrib
@@ -0,0 +1,7 @@
+contrib/cyrus-graphtools.1.0
+contrib/fud-client.c
+contrib/README
+contrib/sieve-spamasssassin
+contrib/squatrunner.pl
+contrib/squatrunner.txt
+contrib/add-cyrus-user
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cron.daily
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cron.daily
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Cyrus IMAPd daily maintenance script
+# Copyright (c) 2002,2003 by Henrique M. Holschuh
+# $Id: cyrus-common-2.2.cron.daily 229 2005-12-08 23:26:29Z astronut $
+# Distributed under the terms of the GNU General Public License version 2
+#
+# This script:
+#   1. Backups the mailbox database to the portable text format,
+#      and compresses the result.  This backup can be used to restore
+#      the Cyrus mailbox database using ctl_mboxlist (after uncompressing
+#      the backup file).
+#
+#   2. Cleans up any leftover crap in .stage directories.
+#
+#   3. Runs chk_cyrus and outputs warning messages (so that cron
+#      sends them to the administrator) if any problems are detected.
+
+set -e
+
+# Make sure we get sane behaviour in broken locales
+LC_ALL=C
+export LC_ALL
+
+bak=/var/backups
+bakfile=${bak}/cyrus-mboxlist.txt.gz
+CONF=/etc/imapd.conf
+CHKCYRUS=0
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+umask 022
+
+# 1. backup mailbox database
+[ -x /usr/sbin/ctl_mboxlist ] && {
+	[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak )
+	[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak
+#	su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ...
+	start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile}
+}
+
+# 2. clean up all leftover .stage directories in all spools listed in
+#    the default config file
+[ $CHKCYRUS -ne 0 ] && {
+    [ -r "$CONF" ] || {
+	echo $0: unable to read configuration file $CONF. Aborting...
+	exit 1
+    }
+    partitions=$(sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+            s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+	    p
+	    } " < "$CONF" | sort | uniq | xargs)
+    for i in $partitions ; do
+	find "$i" -name '.stage' -type d -print0 | \
+	  xargs --null -n 1 -r -i'{1}' \
+	    find {1} -type f -ctime +1 -exec rm -f {} \;
+    done
+}
+
+# 3. runs chk_cyrus
+[ -x /usr/sbin/chk_cyrus ] && {
+	tmpfile=$(mktemp -t cyrus-daily-cronjob.XXXXXXXXXX)
+	trap 'rm -f "${tmpfile}"' 0
+#	su "--command=/usr/sbin/chk_cyrus" - cyrus | ...
+	start-stop-daemon --start --exec /usr/sbin/chk_cyrus --quiet --chuid cyrus >"${tmpfile}" 2>&1 || cat "${tmpfile}" 1>&2
+	rm -f "${tmpfile}"
+	trap '' 0
+}
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-db-types.upgrading_from_1.5.txt
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-db-types.upgrading_from_1.5.txt
@@ -0,0 +1,6 @@
+DBENGINE BerkeleyDB3.2
+DUPLICATE db3_nosync
+MBOX db3
+SEEN db3
+SUBS flat
+TLS db3_nosync
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.init
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
@@ -0,0 +1,239 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides: cyrus-common-2.2
+# Required-Start: $syslog $network
+# Required-Stop: $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: S 0 1 6
+# Short-Description: common init system for cyrus 2.2 IMAP/POP3 daemons.
+# Description: common init system the for cyrus 2.2 IMAP/POP3 daemons.
+#              starts the central cyrus 2.2 master process, which can 
+#              then start various services depending on configuration.
+#              Typically starts IMAP and POP3 daemons, but might also
+#              start an NNTP daemon and various helper daemons for
+#              distributed mail/news storage systems (high-performance
+#              and/or high-reliability setups).
+### END INIT INFO
+#
+#		Copyright 2001-2005 by Henrique de Moraes Holschuh <hmh@debian.org>
+#		Various modifications done by Sven Mueller <debian@incase.de>
+#		Distributed under the GPL version 2
+#
+# $Id: cyrus-common-2.2.cyrus2.2.init 488 2006-06-18 21:00:34Z sven $
+
+# Make sure we get sane results on borked locales
+LC_ALL=C
+export LC_ALL
+
+# Overridable defaults
+unset CYRUS_VERBOSE
+unset LISTENQUEUE
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+
+[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
+OPTIONS="-d"
+[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DAEMON=/usr/sbin/cyrmaster
+NAME=cyrmaster
+DESC="Cyrus IMAPd"
+
+test -x ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`sort -u < $1 | gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }"`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+createdir() {
+# $1 = user
+# $2 = group
+# $3 = permissions (octal)
+# $4 = path to directory
+	[ -d "$4" ] || mkdir -p "$4"
+	chown -c -h "$1:$2" "$4"
+	chmod -c "$3" "$4"
+}
+
+missingstatoverride () {
+	echo "$0: You are missing a dpkg-statoverride on $1.  Add it." >&2
+	exit 1
+}
+
+fixdirs () {
+	dir=`dpkg-statoverride --list /var/run/cyrus` \
+		|| missingstatoverride /var/run/cyrus
+	[ -z "$dir" ] \
+		|| createdir $dir
+	dir=`dpkg-statoverride --list /var/run/cyrus/socket` \
+		|| missingstatoverride /var/run/cyrus/socket
+	[ -z "$dir" ] \
+		|| createdir $dir
+}
+
+check_status () {
+	if [ "$1" = "verbose" ]; then
+		PRINTIT=echo
+	else
+		PRINTIT=true 
+	fi
+	if [ ! -f /var/run/${NAME}.pid ]; then
+		# using [c] in the grep avoids catching the grep 
+		# process itself
+		if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then
+			# Damn, PID file doesn't exist, but cyrmaster process
+			# exists. Though strictly speaking, we should not
+			# do this, reconstruct the PID file here.
+			pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \
+			&& pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
+			return 0
+		fi
+	fi	
+	if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid` > /dev/null 2>&1; then
+		${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
+		return 0
+	else
+		# the PID file might simply not match the cyrmaster process.
+		if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then
+			# go ahead and fix it
+			pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
+			return 0
+		else
+			# no process and/or no PID file, return failure
+			${PRINTIT} "cyrmaster not running with"
+			return 1
+		fi
+	fi
+	# this point should never be reached, return unknown status if it 
+	# is anyway
+	return 4
+}
+
+case "$1" in
+  start)
+  	# Verify if there are old Cyrus 1.5 spools that were not upgraded
+	[ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \
+	  -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
+	  	echo "$0: It appears that you still have an version 1.5 spool" 1>&2
+		echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2
+		echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2
+		echo
+		echo "$0: Cyrmaster not started."
+		exit 6
+	}
+	# Verify consistency of database backends
+	[ -f /usr/lib/cyrus/cyrus-db-types.active ] && {
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		( sort -u /usr/lib/cyrus/cyrus-db-types.active \
+		  | grep DBENGINE \
+		  | verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		) && {
+		    echo "$0: Database backends mismatch! You must manually" 1>&2
+		    echo "$0: verify and update the Cyrus databases to the" 1>&2
+		    echo "$0: new backends." 1>&2
+		    echo "$0: Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian" 1>&2
+		    echo "$0: for instructions." 1>&2
+		    echo
+		    echo "$0: Cyrmaster not started."
+		    exit 6
+		}
+	}
+	echo -n "Starting ${DESC}: "
+	fixdirs
+	if check_status ; then
+		echo "${DAEMON} already running."
+		exit 0
+	fi
+	if start-stop-daemon ${START} >/dev/null 2>&1 ; then
+		echo "$NAME."
+	else
+		if !check_status ; then
+			echo "(failed)."
+			exit 1
+		fi
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+		echo "$NAME."
+		rm -f /var/run/${NAME}.pid
+		exit 0
+	else
+		# process running?
+		if check_status; then
+			# Yes, report failure.
+			echo "(failed)."
+			exit 1
+		else
+			# No, return as if stopped a running process 
+			# successfully.
+			echo "."
+			rm -f /var/run/${NAME}.pid
+			exit 0
+		fi
+	fi
+	;;
+  reload|force-reload)
+	echo "Reloading $DESC configuration files."
+	if start-stop-daemon --stop --signal 1 --quiet \
+		--name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then
+		exit 0
+	else
+		exit 1
+	fi
+  	;;
+  restart)
+  	$0 stop && {
+	  echo -n "Waiting for complete shutdown..."
+	  i=5
+	  while [ $i -gt 0 ] ; do
+	  	# exit look when server is not running
+	  	check_status || break
+		sleep 2s
+		i=$(($i - 1))
+		echo -n "."
+	  done
+	  [ $i -eq 0 ] && {
+	  	echo
+		echo "fatal: incomplete shutdown detected, aborting."
+		exit 1
+	  }
+	  echo
+	}
+	exec $0 start
+	;;
+  status)
+  	check_status verbose
+	exit $?
+	;;
+  try-restart)
+  	check_status
+	if [ "$?" -eq 0 ]; then
+		exec $0 restart
+	else
+  		# LSB says to return 0 in try-restart if the service is
+		# not running.
+		exit 0
+	fi
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2
+	exit 1
+	;;
+esac
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.dirs
@@ -0,0 +1,12 @@
+etc/pam.d
+etc/default
+etc/logcheck/ignore.d.server
+etc/logcheck/violations.ignore.d
+usr/sbin
+usr/lib/cyrus
+usr/lib/cyrus/upgrade
+usr/share/snmp/mibs
+var/lib/cyrus
+var/spool/cyrus
+var/spool/sieve
+var/run/cyrus/socket
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.docs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.docs
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.install
@@ -0,0 +1,21 @@
+etc/*conf
+etc/pam.d/lmtp
+etc/pam.d/sieve
+usr/sbin/cyr*
+usr/sbin/ctl_*
+usr/sbin/cvt_*
+usr/sbin/chk_*
+usr/sbin/ipurge
+usr/sbin/tls_prune
+usr/sbin/mbpath
+usr/sbin/arbitron*
+usr/lib/cyrus/bin/cyr_expire
+usr/lib/cyrus/bin/lmtpd
+usr/lib/cyrus/bin/timsieved
+usr/lib/cyrus/bin/sievec
+usr/lib/cyrus/bin/mbexamine
+usr/lib/cyrus/bin/smmapd
+usr/lib/cyrus/bin/notifyd
+usr/lib/cyrus/bin/fud
+usr/lib/cyrus/get-backtrace.gdb
+usr/share/snmp
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.linda
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.linda
@@ -0,0 +1,2 @@
+Tag: postinst-db-input
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.links
@@ -0,0 +1,3 @@
+var/spool/sieve etc/sieve
+usr/sbin/cyrreconstruct usr/lib/cyrus/bin/reconstruct
+usr/sbin/cyrquota usr/lib/cyrus/bin/quota
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.lintian
@@ -0,0 +1,2 @@
+cyrus-common-2.2: no-debconf-config
+cyrus-common-2.2: postinst-uses-db-input
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.manpages
@@ -0,0 +1,23 @@
+debian/tmp/usr/share/man/man5/cyrus.conf.5
+debian/tmp/usr/share/man/man5/imapd.conf.5
+debian/tmp/usr/share/man/man8/cyrus-makedirs.8
+debian/tmp/usr/share/man/man8/cyrdump.8
+debian/tmp/usr/share/man/man8/mbpath.8
+debian/tmp/usr/share/man/man8/arbitron.8
+debian/tmp/usr/share/man/man8/arbitronsort.8
+debian/tmp/usr/share/man/man8/timsieved.8
+debian/tmp/usr/share/man/man8/notifyd.8
+debian/tmp/usr/share/man/man8/lmtpd.8
+debian/tmp/usr/share/man/man8/ctl_*.8
+debian/tmp/usr/share/man/man8/cvt_*.8
+debian/tmp/usr/share/man/man8/chk_*.8
+debian/tmp/usr/share/man/man8/fud.8
+debian/tmp/usr/share/man/man8/ipurge.8
+debian/tmp/usr/share/man/man8/tls_prune.8
+debian/tmp/usr/share/man/man8/cyrdeliver.8
+debian/tmp/usr/share/man/man8/cyrmaster.8
+debian/tmp/usr/share/man/man8/cyrreconstruct.8
+debian/tmp/usr/share/man/man8/cyrquota.8
+debian/tmp/usr/share/man/man8/mbexamine.8
+debian/tmp/usr/share/man/man8/smmapd.8
+debian/tmp/usr/share/man/man8/cyr_expire.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.postinst
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.postinst
@@ -0,0 +1,156 @@
+#! /bin/sh
+# postinst script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.postinst 318 2006-03-24 19:03:10Z sven $
+#
+# see: dh_installdeb(1)
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+verifydbkey() {
+   while read -r DBKEY DBVALUE ; do
+	if [ "${DBKEY}" = "$2" ] ; then
+	    match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	    [ "x${match}" != "x${DBVALUE}" ] && return 0
+	fi
+   done
+   return 1
+}
+
+case "$1" in
+    configure)
+	# Add the cyrus user (requires adduser >= 3.34)
+	echo "Creating/updating cyrus user account..."
+	adduser --quiet --system --ingroup mail --home /var/spool/cyrus \
+           --shell /bin/sh --disabled-password \
+	   --gecos "Cyrus Mailsystem User"  cyrus >/dev/null || {
+	   if getent passwd | grep -s -q -E '^cyrus:'; then
+		   echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
+		   echo "user. Remove the user and reinstall cyrus-common-2.2." >&2
+		   exit 1
+	   fi
+	   # unknown adduser error, simply exit
+	   exit 1
+	}
+
+	# Force correct owner and modes
+	dpkg-statoverride --list /var/lib/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 /var/lib/cyrus
+	dpkg-statoverride --list /var/spool/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/cyrus
+	dpkg-statoverride --list /var/spool/sieve 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/sieve
+	dpkg-statoverride --list /var/run/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/run/cyrus
+	dpkg-statoverride --list /var/run/cyrus/socket 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 \
+				 /var/run/cyrus/socket
+
+	# Add user cyrus to group SASL, if such group exists
+	adduser cyrus sasl || true
+
+	# Convert the spool to the proper mode, if needed (autodetects
+	# only Debian's default spool, this codepath is meant for package
+	# upgrades only)
+	# DISABLED, since rehash seems busted
+	#[ -d /var/spool/cyrus/mail/A ] && {
+	#	echo Converting spools to basic hash scheme...
+	#	#su - cyrus -c "/usr/lib/cyrus/upgrade/rehash basic"
+	#	start-stop-daemon --start --exec /usr/lib/cyrus/upgrade/rehash --chuid cyrus:mail --verbose -- basic
+	#}
+
+	# Parse imapd.conf and generate all required directories...
+	# also kill any left over squatter indexes
+	/usr/sbin/cyrus-makedirs --cleansquat
+
+	# Deal with database type information
+	if [ -f /usr/lib/cyrus/cyrus-db-types.active ] ; then
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		if verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		    < /usr/lib/cyrus/cyrus-db-types.active ; then
+		    db_input high cyrus-common-2.2/warnbackendchange || true
+		    db_go || true
+		else
+		    cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		    db_fset cyrus-common-2.2/warnbackendchange seen false || true
+		fi
+	else
+		[ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		db_fset cyrus-common-2.2/warnbackendchange seen false || true
+	fi
+
+	# Deal with hardwired config changes
+	if [ -f /usr/lib/cyrus/cyrus-hardwired-config.active ] ; then
+		# do we need to do something about a spool hash type change
+		# if verifydbkey /usr/lib/cyrus/cyrus-hardwired-config.txt USE_DIR_FULL \
+		#    < /usr/lib/cyrus/cyrus-hardwired-config.active ; then
+		# ... (do hash conversion)...
+		# fi
+		cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		      /usr/lib/cyrus/cyrus-hardwired-config.active
+	else
+		[ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		        /usr/lib/cyrus/cyrus-hardwired-config.active
+	fi
+
+	# No leaking of debconf file handles to the initscript stuff
+	db_stop
+
+	# Register initscript, and start it (it is ok if start fails)
+	[ -x /etc/init.d/cyrus2.2 ] && {
+		update-rc.d cyrus2.2 defaults >/dev/null
+		invoke-rc.d cyrus2.2 start || true
+	}
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+db_stop
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.postrm
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.postrm
@@ -0,0 +1,73 @@
+#! /bin/sh
+# postrm script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.postrm 232 2005-12-10 22:18:01Z astronut $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+		remove)
+			;;
+		purge)
+			for i in /var/lib/cyrus /var/spool/sieve \
+				 /var/spool/cyrus \
+				 /var/run/cyrus /var/run/cyrus/socket ; do
+				dpkg-statoverride --remove $i || true
+			done
+			rm -rf /var/run/cyrus || true
+			rm  /usr/lib/cyrus/cyrus-db-types.active || true
+			rm usr/lib/cyrus/cyrus-hardwired-config.active || true
+
+			# Should we remove our precious data?
+			db_title "Cyrus IMAPd 2.2" || true
+			db_fset cyrus-common-2.2/removespools seen false || true
+			db_input high cyrus-common-2.2/removespools || true
+			db_go || true
+
+			db_get cyrus-common-2.2/removespools
+			[ "${RET}" = "true" ] && {
+				for i in /var/spool/cyrus /var/lib/cyrus \
+				         /var/spool/sieve /etc/sieve ; do
+				        find "$i" -type f -exec rm -f '{}' \; || true
+				        find "$i" -type d -depth -not -name 'lost+found' -exec rmdir '{}' \; || true
+				done
+				# Remove database type information
+				rm -f /usr/lib/cyrus/cyrus-*.active
+			}
+
+			update-rc.d cyrus2.2 remove >/dev/null
+        	;;
+
+		upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+			;;
+
+		*)
+			echo "postrm called with unknown argument \`$1'" >&2
+			exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.prerm
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.prerm
@@ -0,0 +1,43 @@
+#! /bin/sh
+# prerm script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.prerm 229 2005-12-08 23:26:29Z astronut $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    	# Call initscript, if it is there to stop the daemon
+ 	invoke-rc.d cyrus2.2 stop || true
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.templates
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.templates
@@ -0,0 +1,25 @@
+Template: cyrus-common-2.2/warnbackendchange
+Type: note
+_Description: Database backends have changed!
+ Comparation between /usr/lib/cyrus/cyrus-db-types.txt and
+ /usr/lib/cyrus/cyrus-db-types.active shows that database backends for
+ Cyrus IMAPd have been changed.
+ .
+ This means that those databases for which the database backends changed
+ might need to be converted manually to the new format, using the
+ cvt_cyrusdb(8) utility.
+ .
+ Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database
+ for more information.  Do not start cyrmaster until you have converted
+ the databases to the new format.
+
+Template: cyrus-common-2.2/removespools
+Type: boolean
+Default: false
+_Description: Remove the Cyrus spools, and user sieve scripts?
+ Should I remove the Cyrus mail and news spools, as well as the user's
+ sieve scripts, when the package is purged ?
+ .
+ This question only applies to the default spools and sieve script
+ directories in /var.  If you modified their location in imapd.conf, the
+ new locations will not be removed; just the old ones in /var.
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.install
@@ -0,0 +1,3 @@
+usr/lib/*.a
+usr/include/cyrus/*
+usr/share/man/man3/imclient*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.dirs
@@ -0,0 +1,2 @@
+usr/include/cyrus
+usr/lib
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.doc-base
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.doc-base
@@ -0,0 +1,10 @@
+Document: cyrus2.2-manual
+Title: CMU Cyrus 2.2 Manual
+Author: Carnegie Mellon University
+Abstract: This manual describes how to configure and administer 
+ the Cyrus POP/IMAP mail system, version 2.2
+Section: mail
+
+Format: HTML
+Index: /usr/share/doc/cyrus-doc-2.2/html/index.html
+Files: /usr/share/doc/cyrus-doc-2.2/html/*.html
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.links
@@ -0,0 +1,2 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-dev-2.2
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/imap
+usr/lib/cyrus/bin/imapd
+usr/sbin/squatter
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.docs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.docs
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-doc-2.2 usr/share/doc/cyrus-common-2.2/docs
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/imapd.conf
+++ cyrus-imapd-2.2-2.2.13/debian/imapd.conf
@@ -0,0 +1,319 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 321 2006-03-27 23:15:15Z astronut $
+# See imapd.conf(5) for more information and more options
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+# News setup
+partition-news: /var/spool/cyrus/news
+newsspool: /var/spool/news
+
+# Alternate namespace
+# If enabled, activate the alternate namespace as documented in
+# /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html, where an user's
+# subfolders are in the same level as the INBOX
+# See also userprefix and sharedprefix on imapd.conf(5)
+altnamespace: no
+
+# UNIX Hierarchy Convention
+# Set to yes, and cyrus will accept dots in names, and use the forward
+# slash "/" to delimit levels of the hierarchy. This is done by converting
+# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
+# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
+unixhierarchysep: no
+
+# Rejecting illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. Enable this to reject such messages.
+#reject8bit: yes
+
+# Munging illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. If you kept reject8bit disabled, you can choose to leave the
+# crappage untouched by disabling this (if you don't care that IMAP SEARCH
+# won't work right anymore.
+#munge8bit: no
+
+# Forcing recipient user to lowercase
+# Cyrus 2.2 is case-sensitive.  If all your mail users are in lowercase, it is
+# probably a very good idea to set lmtp_downcase_rcpt to true.  This is set by 
+# default, per RFC2821. This was not set by default in debian versions up to
+# and including 2.2.12-4.
+lmtp_downcase_rcpt: yes
+
+# Uncomment the following and add the space-separated users who 
+# have admin rights for all services.
+#admins: cyrus
+
+# Space-separated list of users that have lmtp "admin" status (i.e. that
+# can deliver email through TCP/IP lmtp) in addition to those in the
+# admins: entry above
+#lmtp_admins: postman
+
+# Space-separated list of users that have mupdate "admin" status, in
+# addition to those in the admins: entry above. Note that mupdate slaves and 
+# backends in a Murder cluster need to autenticate against the mupdate master
+# as admin users.
+#mupdate_admins: mupdateman
+
+# Space-separated list of users that have imapd "admin" status, in
+# addition to those in the admins: entry above
+#imap_admins: cyrus
+
+# Space-separated list of users that have sieve "admin" status, in
+# addition to those in the admins: entry above
+#sieve_admins: cyrus
+
+# 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.  Like "admins:" above, you can have imap_proxyservers
+# and sieve_proxyservers.
+#proxyservers: cyrus
+
+# No anonymous logins
+allowanonymouslogin: no
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# 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
+
+# umask used by Cyrus programs
+umask: 077
+
+# Sendmail binary location
+# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3. 
+# For now, to work around the bug, set this to a wrapper that calls 
+# /usr/sbin/sendmail -dropcr instead if you use Exim 3.
+#sendmail: /usr/sbin/sendmail
+
+# If enabled, cyrdeliver 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.
+sievedir: /var/spool/sieve
+
+# notifyd(8) method to use for "MAIL" notifications.  If not set, "MAIL"
+# notifications are disabled.  Valid methods are: null, log, zephyr
+#mailnotifier: zephyr
+
+# 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.  Valid methods are null, log, zephyr, mailto
+#sievenotifier: zephyr
+
+# DRAC (pop-before-smtp, imap-before-smtp) support
+# Set dracinterval to the time in minutes to call DRAC while a user is
+# connected to the imap/pop services. Set to 0 to disable DRAC (default)
+# Set drachost to the host where the rpc drac service is running
+#dracinterval: 0
+#drachost: localhost
+
+# 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: true
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+# Force PLAIN/LOGIN authentication only
+# (you need to uncomment this if you are not using an auxprop-based SASL
+# mechanism.  saslauthd users, that means you!). And pay attention to
+# sasl_minimum_layer and allowapop below, too.
+#sasl_mech_list: PLAIN
+
+# Allow use of the POP3 APOP authentication command.
+# Note that this command requires that the plaintext passwords are 
+# available in a SASL auxprop backend (eg. sasldb), and that the system
+# can provide enough entropy (eg. from /dev/urandom) to create a challenge
+# in the banner.
+#allowapop: no
+
+# 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 maximum 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_maximum_layer: 256
+
+# List of remote realms whose users may log in using cross-realm
+# authentications. Seperate each realm name by a space. A cross-realm
+# identity is considered any identity returned by SASL with an "@" in it.
+# NOTE: To support multiple virtual domains on the same interface/IP,
+# you need to list them all as loginreals. If you don't list them here,
+# (most of) your users probably won't be able to log in.
+#loginrealms: example.com
+
+# Enable virtual domain support.  If enabled, the user's domain will
+# be determined by splitting a fully qualified userid at the last '@'
+# or '%' symbol.  If the userid is unqualified, and the virtdomains
+# option is set to "on", then the domain will be determined by doing
+# a reverse lookup on the IP address of the incoming network
+# interface, otherwise the user is assumed to be in the default
+# domain (if set).
+#virtdomains: userid
+
+# The default domain for virtual domain support
+# If the domain of a user can't be taken from its login and it can't
+# be determined by doing a reverse lookup on the interface IP, this
+# domain is used.
+#defaultdomain: 
+
+#
+# SASL library options (these are handled directly by the SASL libraries,
+# refer to SASL documentation for an up-to-date list of these)
+#
+
+# The mechanism(s) used by the server to verify plaintext passwords. Possible
+# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue".  They
+# are tried in order, you can specify more than one, separated by spaces.
+#
+# Do note that, since sasl will be run as user cyrus, you may have a lot of
+# trouble to set this up right.
+sasl_pwcheck_method: auxprop
+
+# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
+# by default, all plugins are tried (which is probably NOT what you want).
+#sasl_auxprop_plugin: sasldb
+
+# If enabled, the SASL library will automatically create authentication secrets
+# when given a plaintext password. Refer to SASL documentation 
+sasl_auto_transition: no
+
+#
+# SSL/TLS Options
+#
+
+# File containing the global certificate used for ALL services (imap, pop3,
+# lmtp, sieve)
+#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+
+# File containing the certificate used for imap. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for imap.
+#tls_imap_cert_file: /etc/ssl/certs/cyrus-imap.pem
+
+# 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.
+#tls_imap_key_file: /etc/ssl/private/cyrus-imap.key
+
+# File containing the certificate used for pop3. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+
+# 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.
+#tls_pop3_key_file: /etc/ssl/private/cyrus-pop3.key
+
+# File containing the certificate used for lmtp. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+
+# 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 SSL/TLS for lmtp.
+#tls_lmtp_key_file: /etc/ssl/private/cyrus-lmtp.key
+
+# File containing the certificate used for sieve. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+
+# 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 SSL/TLS for sieve.
+#tls_sieve_key_file: /etc/ssl/private/cyrus-sieve.key
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+tls_ca_path: /etc/ssl/certs
+
+# 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 list of SSL/TLS ciphers to allow, in decreasing order of precedence.  
+# The format of the string is described in ciphers(1).  The Debian default
+# selects TLSv1 high-security ciphers only, and removes all anonymous ciphers
+# from the list (because they provide no defense against man-in-the-middle
+# attacks).  It also orders the list so that stronger ciphers come first.
+tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#tls_imap_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#tls_pop3_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#tls_lmtp_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#tls_sieve_require_cert: false
+
+#
+# Cyrus Murder cluster configuration
+#
+# Set the following options to the values needed for this server to
+# autenticate against the mupdate master server:
+# mupdate_server
+# mupdate_port
+# mupdate_username
+# mupdate_authname
+# mupdate_realm
+# mupdate_password
+# mupdate_retry_delay
+
+##
+## KEEP THESE IN SYNC WITH cyrus.conf
+##
+# Unix domain socket that lmtpd listens on.
+lmtpsocket: /var/run/cyrus/socket/lmtp
+
+# Unix domain socket that idled listens on.
+idlesocket: /var/run/cyrus/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+notifysocket: /var/run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.)
+syslog_prefix: cyrus
+
+##
+## DEBUGGING
+##
+# Debugging hook. See /usr/share/doc/cyrus-common-2.2/README.Debian.debug
+# Keep the hook disabled when it is not in use
+#
+# gdb Back-traces
+#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+#
+# system-call traces
+#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+#
+# library traces
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
--- cyrus-imapd-2.2-2.2.13.orig/debian/imap.pam
+++ cyrus-imapd-2.2-2.2.13/debian/imap.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus IMAP service
+# $Id: imap.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-imapd-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/idled.8
+debian/tmp/usr/share/man/man8/imapd.8
+debian/tmp/usr/share/man/man8/squatter.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs
@@ -0,0 +1,146 @@
+#!/bin/sh -e
+#
+#  cyrus-makedirs  -  Parses a Cyrus imap.d configuration file, and creates
+#                     the correct directory trees for all partitions
+#
+#  Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh@debian.org.
+#  Released under the terms of the GNU General Public License (GPL) version 2
+#
+# $Id: cyrus-makedirs 229 2005-12-08 23:26:29Z astronut $
+
+# See lib/util.c, dir_hash_c for Cyrus' directory hashing
+# for the new hash style
+#HASHDIRS="A B C D E F G H I J K L M N O P Q R S T U V W"
+# for the old hash style
+HASHDIRS="a b c d e f g h i j k l m n o p q r s t u v w x y z"
+
+# Sane locale, please
+LC_ALL=C
+export LC_ALL
+
+CYRUSOPTFILESYS=1
+CONF=/etc/imapd.conf
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+
+getconf () {
+	confvalue=`sed --silent -e "/^[[:blank:]]*$1:/ { \
+	s#^[[:blank:]]*$1:[[:blank:]]*## \
+	p
+	}" < "$CONF" | head -1`
+	result=${confvalue:-$2}
+}
+
+killsquat=0
+[ "$1" = "--cleansquat" ] && {
+	killsquat=1
+	shift
+}
+
+
+CONF="${1:-$CONF}"
+[ -r "$CONF" ] || {
+	echo $0: unable to read configuration file $CONF. Aborting...
+	exit 1
+}
+
+getconf configdirectory /var/lib/cyrus
+confdir="$result"
+[ -d "$confdir" ] || {
+	echo $0: $confdir is not an directory. Aborting...
+	exit 2
+}
+
+getconf sievedir /etc/sieve
+sievedir="$result"
+
+getconf sieveusehomedir 0
+case "$result" in
+	1|t|true|yes|on) nosievedir=1
+			;;
+	*)		nosievedir=0
+			;;
+esac
+
+getconf hashimapspool 0
+case "$result" in
+	1|t|true|yes|on) hashspool=1
+			;;
+	*)		hashspool=0
+			;;
+esac
+
+# Partitions list
+partitions=`sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+            s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+	    p
+	    } " < "$CONF" | sort | uniq | xargs`
+
+# First, fix up the entire confdir subtree
+echo "Creating cyrus control directories in ${confdir}..."
+[ -d "$confdir" ] || mkdir -p "$confdir"
+chmod 750 "$confdir"
+for i in db proc socket log msg user quota; do
+    [ -d "$confdir/$i" ] || mkdir -p "$confdir/$i"
+    chmod 700 "$confdir/$i"
+done
+chmod 750 $confdir/socket
+for i in user quota ; do
+    for j in $HASHDIRS ; do
+    	[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
+    done
+done
+chown -R cyrus:mail "$confdir"
+
+# Now, create the spool partitions
+for i in $partitions ; do
+	echo "Creating partition spool $i..."
+	[ -d "$i" ] || mkdir -p "$i"
+	chmod 750 "$i"
+	[ $hashspool -eq 1 ] && {
+	   for j in $HASHDIRS ; do
+	        [ -d "$i/$j" ] || mkdir "$i/$j"
+	   done
+	}
+	[ -d "$i/stage." ] || mkdir "$i/stage."
+	chown -R cyrus:mail "$i"
+	# and kill any squatter indexes
+	[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
+done
+
+# And the sieve directory structure
+[ $nosievedir -eq 0 ] && {
+	[ -d "$sievedir" ] || mkdir "$sievedir"
+	chmod 755 "$sievedir"
+	for j in $HASHDIRS ; do
+		[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
+		chmod 755 "$sievedir/$j"
+	done
+	chown -R cyrus:mail "$sievedir"
+}
+
+[ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
+#
+# Fix attributes for every partition
+#
+# ext2:  Don't use ext2 for Cyrus spools. But if you must, enable Sync writes
+# ext3:  Journal data too, since that improves access time a LOT
+#        (maybe in the future, there's a bug in 2.4.18 ext3 w/ +j)
+#
+echo "Trying to optimize Cyrus partitions, edit /etc/default/cyrus2.2 to disable..."
+partsys="${confdir} ${partitions}"
+filesys=`df -P -T ${partsys} | sed -e "1 d" -e "s/ \+/ /g" | cut -d " " -f 2 | xargs`
+for i in ${filesys} ; do
+	case ${i} in
+	ext2)
+  		echo "Setting attributes to +S for  ${partsys%% *}..."
+		find "${partsys%% *}" -type d -exec chattr +S "{}" \;
+		;;
+	ext3)
+  		echo "Setting attributes to -S -j for  ${partsys%% *}..."
+		find "${partsys%% *}" -type d -exec chattr -S -j "{}" \;
+		;;
+	esac
+	partsys="${partsys#* }"
+done
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs.8
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs.8
@@ -0,0 +1,49 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" $Id: cyrus-makedirs.8 229 2005-12-08 23:26:29Z astronut $
+.\" 
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CYRUS-MAKEDIRS 8 "2002-12-08"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+cyrus-makedirs \- Sets up the Cyrus IMAPd system directories (spools)
+.SH SYNOPSIS
+.B cyrus-makedirs
+.RI [ configfile ]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B cyrus-makedirs
+command.
+Cyrus-makedirs is the Debian version of Cyrus upstream's mkimap program.
+.PP
+You
+.B should
+call /usr/sbin/cyrus-makedirs when you change any imapd.conf(5) options
+that create or rename Cyrus mail stores/spools/partitions.  It will be called
+automatically on package upgrades.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+.SH OPTIONS
+You can optionally tell cyrus-makedirs the Cyrus imapd.conf config file
+to use.  /etc/imapd.conf is assumed, if no parameters are given.
+.SH SEE ALSO
+.BR imapd.conf(5),
+.BR /etc/default/cyrus2.2
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-murder-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-murder-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/mupdate
+usr/lib/cyrus/bin/*proxyd
+usr/lib/cyrus/bin/mupdate*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-murder-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-murder-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-murder-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/nntp
+usr/lib/cyrus/bin/fetchnews
+usr/lib/cyrus/bin/nntpd
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-nntpd-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.manpages
@@ -0,0 +1,2 @@
+man/fetchnews.8
+man/nntpd.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.dirs
@@ -0,0 +1 @@
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.install
@@ -0,0 +1,4 @@
+etc/pam.d/pop
+usr/sbin/pop3*
+usr/lib/cyrus/bin/pop3d
+usr/share/man/man8/pop3d*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.links
@@ -0,0 +1,2 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-pop3d-2.2
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.manpages
@@ -0,0 +1 @@
+man/pop3d.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus.conf
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus.conf
@@ -0,0 +1,90 @@
+# Debian defaults for Cyrus IMAP server/cluster implementation
+# see cyrus.conf(5) for more information
+#
+# All the tcp services are tcpd-wrapped. see hosts_access(5)
+# $Id: cyrus.conf 457 2006-05-16 21:18:07Z sven $
+
+START {
+	# do not delete this entry!
+	recover		cmd="/usr/sbin/ctl_cyrusdb -r"
+  
+	# this is only necessary if using idled for IMAP IDLE
+	# this is NOT to be enabled right now in Debian builds
+	#idled		cmd="idled"
+
+	# this is useful on backend nodes of a Murder cluster
+	# it causes the backend to syncronize its mailbox list with
+	# the mupdate master upon startup
+	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
+
+	# this is recommended if using duplicate delivery suppression
+	delprune	cmd="/usr/sbin/cyr_expire -E 3"
+	# this is recommended if caching TLS sessions
+	tlsprune	cmd="/usr/sbin/tls_prune"
+}
+
+# UNIX sockets start with a slash and are absolute paths
+# you can use a maxchild=# to limit the maximum number of forks of a service
+# you can use babysit=true and maxforkrate=# to keep tight tabs on the service
+# most services also accept -U (limit number of reuses) and -T (timeout)
+SERVICES {
+	# --- Normal cyrus spool, or Murder backends ---
+	# add or remove based on preferences
+	imap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=100
+	#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
+	pop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
+	#pop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
+	nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
+	#nntps		cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100
+
+	# At least one form of LMTP is required for delivery
+	# (you must keep the Unix socket name in sync with imap.conf)
+	#lmtp		cmd="lmtpd" listen="localhost:lmtp" prefork=0 maxchild=20
+	lmtpunix	cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20
+	# ----------------------------------------------
+
+	# useful if you need to give users remote access to sieve
+	# by default, we limit this to localhost in Debian
+  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=100
+
+	# this one is needed for the notification services
+	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1
+
+	# --- Murder frontends -------------------------
+	# enable these and disable the matching services above, 
+	# except for sieve (which deals automatically with Murder)
+
+	# mupdate database service - must prefork at least 1
+	# (mupdate slaves)
+	#mupdate       cmd="mupdate" listen=3905 prefork=1
+	# (mupdate master, only one in the entire cluster)
+	#mupdate       cmd="mupdate -m" listen=3905 prefork=1
+
+	# proxies that will connect to the backends
+	#imap		cmd="proxyd" listen="imap" prefork=0 maxchild=100
+	#imaps		cmd="proxyd -s" listen="imaps" prefork=0 maxchild=100
+	#pop3		cmd="pop3proxyd" listen="pop3" prefork=0 maxchild=50
+	#pop3s		cmd="pop3proxyd -s" listen="pop3s" prefork=0 maxchild=50
+	#lmtp		cmd="lmtpproxyd" listen="lmtp" prefork=1 maxchild=20
+	# ----------------------------------------------
+}
+
+EVENTS {
+	# this is required
+	checkpoint	cmd="/usr/sbin/ctl_cyrusdb -c" period=30
+
+	# this is only necessary if using duplicate delivery suppression
+	delprune	cmd="/usr/sbin/ctl_deliver -E 3" at=0401
+
+	# this is only necessary if caching TLS sessions
+	tlsprune	cmd="/usr/sbin/tls_prune" at=0401
+	
+	# indexing of mailboxs for server side fulltext searches
+
+	# reindex changed mailboxes (fulltext) approximately every other hour
+	#squatter_1	cmd="/usr/bin/nice -n 19 /usr/sbin/squatter -s" period=120
+
+	# reindex all mailboxes (fulltext) daily
+	#squatter_a	cmd="/usr/sbin/squatter" at=0517
+}
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/deletable.files
+++ cyrus-imapd-2.2-2.2.13/debian/deletable.files
@@ -0,0 +1,100 @@
+config.guess
+config.sub
+doc/man/arbitron.8.html
+doc/man/chk_cyrus.8.html
+doc/man/ctl_cyrusdb.8.html
+doc/man/ctl_deliver.8.html
+doc/man/ctl_mboxlist.8.html
+doc/man/cvt_cyrusdb.8.html
+doc/man/cyr_expire.8.html
+doc/man/cyradm.1.html
+doc/man/cyrus.conf.5.html
+doc/man/deliver.8.html
+doc/man/fetchnews.8.html
+doc/man/fud.8.html
+doc/man/idled.8.html
+doc/man/imapd.8.html
+doc/man/imapd.conf.5.html
+doc/man/imclient.3.html
+doc/man/imtest.1.html
+doc/man/installsieve.1.html
+doc/man/ipurge.8.html
+doc/man/krb.equiv.5.html
+doc/man/lmtpd.8.html
+doc/man/lmtptest.1.html
+doc/man/master.8.html
+doc/man/mbexamine.8.html
+doc/man/mbpath.8.html
+doc/man/mupdatetest.1.html
+doc/man/nntpd.8.html
+doc/man/nntptest.1.html
+doc/man/notifyd.8.html
+doc/man/pop3d.8.html
+doc/man/pop3test.1.html
+doc/man/quota.8.html
+doc/man/reconstruct.8.html
+doc/man/rmnews.8.html
+doc/man/sieveshell.1.html
+doc/man/sivtest.1.html
+doc/man/smmapd.8.html
+doc/man/smtptest.1.html
+doc/man/squatter.8.html
+doc/man/syncnews.8.html
+doc/man/timsieved.8.html
+doc/man/tls_prune.8.html
+doc/man/w
+doc/murder.png
+doc/netnews.png
+doc/text/altnamespace
+doc/text/anoncvs
+doc/text/bugs
+doc/text/changes
+doc/text/faq
+doc/text/feedback
+doc/text/index
+doc/text/install
+doc/text/install-admin-mb
+doc/text/install-auth
+doc/text/install-compile
+doc/text/install-configure
+doc/text/install-murder
+doc/text/install-netnews
+doc/text/install-perf
+doc/text/install-prereq
+doc/text/install-sieve
+doc/text/install-snmpmon
+doc/text/install-testing
+doc/text/install-upgrade
+doc/text/install-virtdomains
+doc/text/mailing-list
+doc/text/man
+doc/text/notes
+doc/text/os
+doc/text/overview
+doc/text/questions
+doc/text/readme
+doc/text/sieve
+doc/text/sieve-protocol
+doc/text/specs
+imap/imap_err.c
+imap/imap_err.h
+imap/lmtpstats.c
+imap/lmtpstats.h
+imap/mupdate_err.c
+imap/mupdate_err.h
+imap/nntp_err.c
+imap/nntp_err.h
+imap/pushstats.c
+imap/pushstats.h
+lib/imapopts.c
+lib/imapopts.h
+man/imapd.conf.5
+man/sieveshell.1
+sieve/addr-lex.c
+sieve/addr.c
+sieve/addr.h
+sieve/sieve-lex.c
+sieve/sieve.c
+sieve/sieve.h
+sieve/sieve_err.c
+sieve/sieve_err.h
--- cyrus-imapd-2.2-2.2.13.orig/debian/executable.files
+++ cyrus-imapd-2.2-2.2.13/debian/executable.files
@@ -0,0 +1,42 @@
+./autogen.sh
+./configure
+./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+./contrib/cyrus-graphtools.1.0/script/cyrus.pl
+./contrib/cyrus-graphtools.1.0/script/run
+./contrib/mupdate-test.pl
+./contrib/notify_unix/simple_notify.pl
+./contrib/notify_unix/sql_notify.pl
+./debian/cyrus-makedirs
+./debian/cyrus-common-2.2.cyrus2.2.init
+./debian/cyrus-common-2.2.postinst
+./debian/cyrus-common-2.2.postrm
+./debian/cyrus-common-2.2.prerm
+./debian/examples/mboxtocyrus
+./debian/rules
+./doc/internal/internationalization.html
+./et/compile_et.sh
+./et/config_script
+./imap/xversion.sh
+./install-sh
+./lib/test/run
+./makedepend/configure
+./makedepend/install-sh
+./mkinstalldirs
+./netnews/inn.diffs
+./perl/imap/examples/test-imsp.pl
+./snmp/snmpgen
+./tools/arbitronsort.pl
+./tools/config2header
+./tools/config2man
+./tools/dohash
+./tools/masssievec
+./tools/mkimap
+./tools/mknewsgroups
+./tools/mupdate-loadgen.pl
+./tools/not-mkdep
+./tools/rehash
+./tools/translatesieve
+./tools/undohash
+./tools/upgradesieve
--- cyrus-imapd-2.2-2.2.13.orig/debian/get-backtrace.gdb
+++ cyrus-imapd-2.2-2.2.13/debian/get-backtrace.gdb
@@ -0,0 +1,4 @@
+c
+bt
+quit
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.manpages
@@ -0,0 +1,5 @@
+perl/imap/blib/man3/Cyrus::IMAP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Admin.3pm
+perl/imap/blib/man3/Cyrus::IMAP::IMSP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Shell.3pm
+perl/sieve/managesieve/blib/man3/Cyrus::SIEVE::managesieve.3pm
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.install
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.install
@@ -0,0 +1,2 @@
+usr/lib/perl*
+usr/share/perl*
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.lintian
@@ -0,0 +1 @@
+libcyrus-imap-perl21: package-installs-nonbinary-perl-in-usr-lib-perl5
--- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.ignore
+++ cyrus-imapd-2.2-2.2.13/debian/logcheck.ignore
@@ -0,0 +1,54 @@
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: recovered
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: checkpointed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: pruning
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: purged
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +executed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +accepted connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +telling master
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(bad)?login:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +starttls: [[:alnum:]]+ with cipher
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +DIGEST-MD5 server step
+cyrus/ctl_cyrusdb\[[0-9]+\]: +(done +)?recovering cyrus databases
+cyrus/ctl_cyrusdb\[[0-9]+\]: +archiving
+cyrus/ctl_cyrusdb\[[0-9]+\]: +checkpointing
+cyrus/ctl_cyrusdb\[[0-9]+\]: +done checkpointing
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: pruning back
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: purged
+cyrus/tls_prune\[[0-9]+\]: +(tls_prune: )?purged
+cyrus/master\[[0-9]+\]: +ready for work
+cyrus/master\[[0-9]+\]: +about to exec
+cyrus/master\[[0-9]+\]: +process started
+cyrus/master\[[0-9]+\]: +process [0-9]+ exited, status 0$
+cyrus/master\[[0-9]+\]: +service [a-zA-Z0-9]+ now has [0-9]+ workers
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +lmtp connection preauth'd as postman
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +dupelim: eliminated duplicate message to
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_check:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_mark:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve parse error
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve: discarded
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +abort_txn: aborting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +delete: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +open: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mycommit: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +seen_db: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +Connection reset by peer, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT returned [0-9]+ messages
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +idle for too long, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +annotatemore_store
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +created stage directory
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +synchronizing mailbox
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mailbox list synchronization
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
+cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
+cyrus/notifyd\[[0-9]+\]: do_notify using method
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
--- cyrus-imapd-2.2-2.2.13.orig/debian/license.html
+++ cyrus-imapd-2.2-2.2.13/debian/license.html
@@ -0,0 +1,161 @@
+
+
+<! $Id: license.html 5 2005-03-12 23:19:45Z sven $ >
+<HTML>
+<TITLE>
+Cyrus IMAP Licensing
+</TITLE>
+
+</HEAD>
+<BODY BGCOLOR="#ffffff">
+<P><MAP NAME="masthead">
+    <AREA SHAPE="rect" COORDS="0,0,125,22" HREF="http://www.cmu.edu/computing/">
+    <AREA SHAPE="rect" COORDS="429,2,539,27" HREF="http://www.cmu.edu/">
+</MAP><IMG SRC="/images/masthead.jpg" ALT="Masthead" 
+ALIGN="BOTTOM" NATURALSIZEFLAG="3" ISMAP BORDER="0" USEMAP="#masthead"><BR>
+<TABLE WIDTH="575" BORDER="0" CELLSPACING="0" CELLPADDING="0">
+<TR>
+<TD WIDTH="50%" VALIGN="TOP"><B><BIG><FONT FACE="geneva,
+		arial,helvetica, times" SIZE=+3>
+Cyrus IMAP Licensing
+</FONT></BIG></B><BR>
+<IMG SRC="/images/w.jpg" WIDTH="270" HEIGHT="1" ALIGN="BOTTOM" NATURALSIZEFLAG=
+"0"></TD>
+<TD WIDTH="50%" VALIGN="TOP" ALIGN="RIGHT">
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/">
+ASG Home</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/whatsnew.html">
+What's New</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/jobs.html">
+Jobs</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/search.html">
+Search</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="mailto:andrew2-webmaster+@andrew.cmu.edu">
+Contact Us</a></FONT>&nbsp;&nbsp;<BR>
+
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/download">
+<b>Download Software</b></a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/mailing-list.html">
+<b>Mailing lists</b></a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus">
+Project Cyrus Home</a></FONT>&nbsp;&nbsp;
+<br>
+
+
+
+<br>
+<IMG SRC="/images/w.jpg" WIDTH="250" HEIGHT="1" ALIGN="BOTTOM"
+NATURALSIZEFLAG= "0"></TD></TR>
+  </TABLE>
+<p>
+
+
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+@andrew.cmu.edu">cyrus-bugs@andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+      href="mailto:tech-transfer+@andrew.cmu.edu">tech-transfer@andrew.cmu.edu</a></tt>.
+<hr>
+
+<b>ALL</b> versions of the Cyrus IMAP server are now covered by the
+following copyright message. However, please note that in
+  distributions before 2.0, there may still be files that have the old 
+  copyright text.
+
+<blockquote>
+<xmp>
+ * Copyright (c) 1994-2000 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact  
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+</xmp>
+</blockquote>
+
+<p>
+If you find this software useful and valuable in your work, we welcome
+any support you can offer toward continuing this work.
+ 
+<p>We gratefully accept contributions, whether intellectual or
+monetary.  Intellectual contributions in the form of code or
+constructive collaboration can be directed to <a
+href="mailto:cyrus-bugs+@andrew.cmu.edu"><tt>cyrus-bugs+@andrew.cmu.edu</tt></a>
+(even if it is not a bug).
+
+<p>If you wish to provide financial support to the Cyrus Project, send a
+check payable to <b>Carnegie Mellon University</b> to
+ 
+<blockquote>
+<xmp>
+       Project Cyrus
+       Computing Services
+       Carnegie Mellon University
+       5000 Forbes Ave
+       Pittsburgh, PA 15213
+       USA
+</xmp>
+</blockquote>
+<hr>
+<p>
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+@andrew.cmu.edu">cyrus-bugs@andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+      href="mailto:tech-transfer+@andrew.cmu.edu">tech-transfer@andrew.cmu.edu</a></tt>.
+
+<p>
+    <hr>
+    <address><! (c) 1999 Carnegie Mellon University. All Rights Reserved.</address>
+<font size="-2">
+Last Updated: Thursday, 12-Oct-2000 16:38:41 EDT
+</font>
+  </body>
+</html>
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/lmtp.pam
+++ cyrus-imapd-2.2-2.2.13/debian/lmtp.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus LMTP service
+# $Id: lmtp.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/sieve.pam
+++ cyrus-imapd-2.2-2.2.13/debian/sieve.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus SIEVE timsieved service
+# $Id: sieve.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/nntp.pam
+++ cyrus-imapd-2.2-2.2.13/debian/nntp.pam
@@ -0,0 +1,13 @@
+# PAM configuration file for Cyrus NNTP service
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.violations.ignore
+++ cyrus-imapd-2.2-2.2.13/debian/logcheck.violations.ignore
@@ -0,0 +1,5 @@
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
--- cyrus-imapd-2.2-2.2.13.orig/debian/mupdate.pam
+++ cyrus-imapd-2.2-2.2.13/debian/mupdate.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus Murder mupdate service
+# $Id: mupdate.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/pop.pam
+++ cyrus-imapd-2.2-2.2.13/debian/pop.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus POP3 service
+# $Id: pop.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/rules
+++ cyrus-imapd-2.2-2.2.13/debian/rules
@@ -0,0 +1,351 @@
+#!/usr/bin/make -f
+# debian/rules for CMU Cyrus IMAP version 2.2
+# GNU copyright 1997 by Joey Hess.
+# Copyright (c) 2001 by Henrique de Moraes Holschuh
+# Published under the GNU GPL license
+# Based on previous work by Michael-John Turner <mj@debian.org>,
+#			    David Parker <david@neongoat.com>
+#
+
+# DebHelper control
+export DH_ALWAYS_EXCLUDE=CVS
+
+export MAINPKG=cyrus-common-2.2
+export DOCPKG=cyrus-doc-2.2
+export TMPPKG := $(CURDIR)/debian/tmp
+export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
+export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# enable dpatch usage
+include /usr/share/dpatch/dpatch.make
+
+# Extra version information to add to Cyrus IMAPd ID
+DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')
+EXTRA_IDENT:="Debian-$(DEBVERSION)"
+
+# DB engine version
+DBENGINE=BerkeleyDB4.3
+
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	DEBUGFLAGS += -O0
+else
+	DEBUGFLAGS += -O2
+endif
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+CONFFLAGS =
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Other oddities
+ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS)))
+	CONFFLAGS += --enable-warnings-are-errors
+endif
+
+# The clean target will remove any and all cruft (as defined by 
+# configure ; make distclean ; cd intl; make distclean ). 
+# This is done to make sure the build daemon's source tree is the 
+# same as the one I am using to produce the i386 debs. 
+clean: clean-patched unpatch
+clean-patched: configure
+	dh_testdir
+	dh_testroot
+	-xargs -t -r chmod +x < debian/executable.files
+	-rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp
+	-$(MAKE) -i distclean
+	-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
+	-rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
+	-rm -f doc/pod2htm*
+	-rm -f master/makedepend.log 
+	-rm -rf doc/man
+	-rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options
+	# -rm -rf et/
+	rm -rf autom4te.cache
+	-xargs -t -r rm -f < debian/deletable.files
+	dh_clean
+
+configure:
+	# ./autogen.sh
+
+build: build-arch build-indep
+
+configure-stamp: patch
+	dh_testdir
+	-rm -f config.sub config.guess
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
+	touch configure.in && touch aclocal.m4 && touch configure
+
+	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
+	# DBENGINE AT THE TOP OF THIS MAKEFILE!
+	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+	 --with-extraident=$(EXTRA_IDENT) \
+	 --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
+	 --bindir=/usr/sbin --sbindir=/usr/sbin \
+	 --includedir=/usr/include/cyrus \
+	 --datadir=/usr/share/cyrus --sysconfdir=/etc \
+	 --with-statedir=/var/state \
+	 --sharedstatedir=/usr/share/cyrus \
+	 --localstatedir=/var/lib/cyrus \
+	 --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \
+	 --with-perl=/usr/bin/perl \
+	 --with-openssl=/usr --with-auth=unix \
+	 --enable-murder --enable-nntp \
+	 --disable-listext --enable-annotatemore --with-sasl=/usr \
+	 --with-idle=poll --with-drac=/usr \
+	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
+	 --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \
+	 --with-pidfile=/var/run/cyrmaster.pid \
+	 --with-syslogfacility=MAIL \
+	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \
+	 --with-ucdsnmp=/usr
+	echo 'To build this package, configure was called as follows:' \
+		> debian/README.configure-options
+	grep with\ options config.status \
+	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
+		>> debian/README.configure-options
+	sed -i 's/ -lsensors//' master/Makefile
+	touch configure-stamp
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+	dh_testdir
+
+	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
+	# store database configuration for possible automatic
+	# upgrading later
+	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
+	grep -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
+	  sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
+	  >>debian/cyrus-db-types.txt
+	mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
+	&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
+	&& rm debian/cyrus-db-types.txt.old
+
+	# store some useful state about the current package
+	echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
+	if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
+		echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\
+	else \
+		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
+	fi
+
+	touch build-arch-stamp
+
+# We aren't actually able to build arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp build-arch
+	dh_testdir
+
+	cd doc &&\
+	pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
+	fig2dev -L png murder.fig murder.png &&\
+	rm -f groff-html-*.png pod2htm*
+	cd doc &&\
+	mkdir -p man &&\
+	for man in ../man/*.[1-9] ../debian/*.[1-9]; do \
+	   echo "Generating html manpage for $$man..."; \
+	   groff -man -Thtml $$man > man/`basename $$man`.html; \
+	done
+	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
+	rm -f pod2htm*
+
+	touch build-indep-stamp
+
+install-arch: build-arch 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+
+	$(MAKE) install DESTDIR=$(TMPPKG)
+
+	# fix totaly broken location of the include files;
+	# while at it, also avoid namespace colision, and move
+	# lots of admin-only/system-only stuff to sbin and lib
+	# also, do the renaming needed for alternatives
+	# and fix the weird side-effect of setting the proper cyrus
+	# location in configure.
+	mkdir -p $(TMPPKG)/usr/sbin
+	mkdir -p $(TMPPKG)/usr/lib/cyrus
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\
+	done
+	for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
+	         tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\
+	done
+	mkdir -p $(TMPPKG)/usr/include
+	mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
+	#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
+
+	# Move the perl crap to a saner place
+	mkdir -p $(TMPPKG)/usr/lib
+	mkdir -p $(TMPPKG)/usr/share/perl5
+	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
+	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
+
+	# for stuff in /etc
+	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
+	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
+	install -m 644 debian/cyrus.conf    $(TMPPKG)/etc
+	(cd debian ; for i in *.pam ;\
+		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
+	done)
+
+	# We rename some utils, so we need to sort out the manpages
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
+	done
+
+	# And add our own manpages
+	mkdir -p $(TMPPKG)/usr/share/man/man8
+	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
+	install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
+	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
+
+	# SNMP files
+	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
+	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
+
+	# Install cyradm icons
+	mkdir -p $(TMPPKG)/usr/share/icons/mini
+	install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
+	install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
+
+	# Install debian-provided scripts
+	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
+	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
+
+	# and logcheck files
+	install -m 644 debian/logcheck.ignore \
+	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_2
+	install -m 644 debian/logcheck.violations.ignore \
+	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_2
+
+	# Install the stuff needed for upgrades
+	for i in convert-sieve.pl dohash rehash undohash translatesieve \
+		 upgradesieve masssievec; do \
+		install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\
+	done
+	install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade
+	# And other upgrade helpers
+	install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
+		   $(PKGDIR)/usr/lib/cyrus
+	# And other misc useful tools
+	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
+
+	# Install imtest and its symlinks
+	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.2/usr/bin
+	for i in $(TMPPKG)/usr/bin/*test ; do \
+		rm -f "$$i" || true ;\
+		(cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\
+		 ln -s imtest `basename $$i`) ;\
+	done
+
+	# Lintian and Linda overrides
+	cd debian ; \
+	for i in *.linda ; do \
+		mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
+		install  -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
+	done ;\
+	for i in *.lintian ; do \
+		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
+		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
+	done
+
+	dh_install -a --sourcedir=$(TMPPKG)
+	touch install-arch-stamp
+
+# We aren't actually able to install arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+install-indep: build-indep install-arch
+	dh_testdir
+	dh_testroot
+	#dh_clean -k
+	dh_installdirs -i
+
+	# Massage the documentation into place
+	#mkdir -p $(DOCDIR)
+	#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
+	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
+	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
+
+	# Install the html docs and examples
+	mkdir -p $(DOCDIR)/html
+	install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
+	cp -a doc/man $(DOCDIR)/html
+	cp -a debian/examples $(DOCDIR)
+	install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
+
+	# Install contrib/ files
+	mkdir -p $(DOCDIR)/contrib
+	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+
+	dh_install -i --sourcedir=$(TMPPKG)
+
+binary-indep: install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -p cyrus-admin-2.2 -p cyrus-doc-2.2
+	dh_installexamples -p cyrus-admin-2.2
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installcron -i
+	dh_installman -i
+	dh_installchangelogs -p cyrus-admin-2.2 doc/changes.html
+	dh_installchangelogs -p cyrus-doc-2.2
+	dh_strip -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install-arch
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdebconf -a
+	dh_installdocs -p $(MAINPKG) -p cyrus-clients-2.2 -p libcyrus-imap-perl22
+	dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus-clients-2.2
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installpam -a
+#	dh_installmime -a
+	dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2
+	dh_installcron -a
+	dh_installman -a
+#	dh_installinfo -a
+	dh_installchangelogs -p $(MAINPKG) -p cyrus-clients-2.2 doc/changes.html
+	dh_installchangelogs -p libcyrus-imap-perl22 perl/imap/Changes
+	dh_fixperms -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep clean-patched
--- cyrus-imapd-2.2-2.2.13.orig/debian/watch
+++ cyrus-imapd-2.2-2.2.13/debian/watch
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-(2\.2\..*).tar.(?:gz|bz2)
--- cyrus-imapd-2.2-2.2.13.orig/debian/source.lintian-overrides
+++ cyrus-imapd-2.2-2.2.13/debian/source.lintian-overrides
@@ -0,0 +1 @@
+cyrus-imapd-2.2 source: source-contains-CVS-dir