[pkg-kolab] r1485 - in kolab-cyrus-imapd/trunk/debian: . patches po

Mathieu Parent sathieu at alioth.debian.org
Thu Jan 28 12:07:09 UTC 2010


Author: sathieu
Date: 2010-01-28 12:07:05 +0000 (Thu, 28 Jan 2010)
New Revision: 1485

Added:
   kolab-cyrus-imapd/trunk/debian/patches/99-berkelydb-4.8.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/series
Removed:
   kolab-cyrus-imapd/trunk/debian/patches/00list
Modified:
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/control
   kolab-cyrus-imapd/trunk/debian/logcheck.ignore
   kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
   kolab-cyrus-imapd/trunk/debian/patches/0001-upstream-fix-segfault.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0003-upstream_disallow_userprobes.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0006-upstream-free-backend-fix.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0008-upstream-better-message-track-logging.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0016-upstream-fix-typos.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0020-upstream-client-literal-prefix.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0023-sort-illegal-dates-first.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/0090-fix-casts.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/02-add_mkinstalldirs.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/03-fix_docs.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/04-add_autogen.sh.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/05-fix_programnames.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/06-disable_runpath.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/07-update_aclocal_and_configure.in.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/08-clean_socket_closes.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/10-fix_potential_overflows.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/11-fix_syslog_prefix.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/12-fix_timeout_handling.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/14-xmalloc.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/15-munge_8bit.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/16-fix_mib.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/19-fix_tls_ssl.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/23-configurable_idled.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/30-update_perlcalling.sh.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/35-masssievec_remove_unused_variable.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/40-rehash_fix_pathes.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/70-allow-larger-buffers.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/72-faster-isdigit.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/75-update-imapd.conf-documentation.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/77-change-missing-sieve-notice.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/80-kbsd-no-psstrings.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/82-allow-from_-header.dpatch
   kolab-cyrus-imapd/trunk/debian/patches/99-update-autoconf.dpatch
   kolab-cyrus-imapd/trunk/debian/po/vi.po
   kolab-cyrus-imapd/trunk/debian/rules
Log:
  * Synced against cyrus-imapd package (2.2.13-19)
    - Upgrade to use BerkeleyDB 4.7. (Closes: #524427)
    - Use quilt (Closes: #560628)


Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2010-01-28 12:07:05 UTC (rev 1485)
@@ -1,9 +1,41 @@
 kolab-cyrus-imapd (2.2.13-9) UNRELEASED; urgency=low
 
+  * Synced against cyrus-imapd package
+    - Upgrade to use BerkeleyDB 4.7. (Closes: #524427)
+    - Use quilt (Closes: #560628)
   * Enable imaps by default
 
- -- Mathieu Parent <sathieu at debian.org>  Tue, 17 Nov 2009 21:43:35 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 28 Jan 2010 12:29:04 +0100
 
+cyrus-imapd-2.2 (2.2.13-19) unstable; urgency=low
+
+  * Switch to BerkeleyDB 4.7, the version OpenLDAP uses.
+  * Add patch by Cristian Rigamonti to fix logcheck rules for "defaultbc
+    doesn't exist" error message. (Closes: #511030)
+  * Update Vietnamese debconf translation, thanks Clytie Siddall.
+    (Closes: #548052)
+  * Upload to unstable for the libkrb transition.
+
+ -- Christoph Berg <myon at debian.org>  Sat, 23 Jan 2010 23:35:21 +0100
+
+cyrus-imapd-2.2 (2.2.13-18) experimental; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * sieve/bc_eval.c (0025-upstream-fix-cve-2009-3235.dpatch):
+    update for completeness to match the patch used by the security-team:
+    use snprintf for scount, to future-proof against "int" larger than
+    64 bits.
+
+  [ Christoph Berg ]
+  * Add myself to Uploaders.
+  * Upgrade to use BerkeleyDB 4.8. (Closes: #421942)
+  * Convert to use quilt, and update the patch headers to use clean paths.
+    (Closes: #563303)
+  * Add patch by Mathieu Parent to fix conflicting getline definition.
+    (Closes: #552865)
+
+ -- Christoph Berg <myon at debian.org>  Fri, 22 Jan 2010 22:16:02 +0100
+
 kolab-cyrus-imapd (2.2.13-8) unstable; urgency=low
 
   * Remove kolab-cyrus-common.linda 

Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/control	2010-01-28 12:07:05 UTC (rev 1485)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), dpatch, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
+Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.7-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-cyrus-imapd/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-cyrus-imapd/trunk/
 Homepage: http://cyrusimap.web.cmu.edu/

Modified: kolab-cyrus-imapd/trunk/debian/logcheck.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.ignore	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.ignore	2010-01-28 12:07:05 UTC (rev 1485)
@@ -52,7 +52,7 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script /var/spool/sieve/[/[:alnum:]^]+defaultbc doesn't exist: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script /var/spool/sieve/[._/[:alnum:]^-]+defaultbc doesn't exist: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$

Modified: kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore	2010-01-28 12:07:05 UTC (rev 1485)
@@ -1,5 +1,5 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [._/a-zA-Z^-]+/defaultbc: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$

Modified: kolab-cyrus-imapd/trunk/debian/patches/0001-upstream-fix-segfault.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0001-upstream-fix-segfault.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0001-upstream-fix-segfault.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c 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
++++ 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;

Modified: kolab-cyrus-imapd/trunk/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0002-allow_invalid_id_acl_removal.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0002-allow_invalid_id_acl_removal.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Upstream: Allow removal of invalid ID ACLs
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c
+diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c 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
++++ 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;

Modified: kolab-cyrus-imapd/trunk/debian/patches/0003-upstream_disallow_userprobes.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0003-upstream_disallow_userprobes.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0003-upstream_disallow_userprobes.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -7,9 +7,9 @@
 ## DP: "Unknown user" for unknown user names.
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c 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
++++ cyrus-imapd-2.2.13/imap/imapd.c	2006-05-03 16:02:02.685827405 +0200
 @@ -1785,6 +1785,9 @@
  
  	sleep(3);
@@ -40,9 +40,9 @@
  	    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
+diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c 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
++++ cyrus-imapd-2.2.13/imap/nntpd.c	2006-05-03 16:02:02.678828066 +0200
 @@ -2140,13 +2140,16 @@
  	    default:
  		code = 481;
@@ -61,9 +61,9 @@
  	    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
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c 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
++++ 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)
@@ -114,9 +114,9 @@
  	}
  	
  	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
+diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c 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
++++ 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;

Modified: kolab-cyrus-imapd/trunk/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: (daylight saving time)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c
+diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c 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
++++ 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"

Modified: kolab-cyrus-imapd/trunk/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: and undumps mailbox type flags)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html 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
++++ cyrus-imapd-2.2.13/doc/changes.html	2006-05-03 17:26:24.115155499 +0200
 @@ -8,6 +8,12 @@
  </head>
  <body>
@@ -22,9 +22,9 @@
  <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
+diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 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
++++ 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:
@@ -65,9 +65,9 @@
  	
  	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
+diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 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
++++ cyrus-imapd-2.2.13/man/ctl_mboxlist.8	2006-05-03 17:26:24.125154559 +0200
 @@ -104,7 +104,9 @@
  .TP
  .B \-d

Modified: kolab-cyrus-imapd/trunk/debian/patches/0006-upstream-free-backend-fix.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0006-upstream-free-backend-fix.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0006-upstream-free-backend-fix.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c 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
++++ 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.
   */

Modified: kolab-cyrus-imapd/trunk/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0007-upstream-remove-undump-size-limit.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0007-upstream-remove-undump-size-limit.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c 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
++++ 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 $

Modified: kolab-cyrus-imapd/trunk/debian/patches/0008-upstream-better-message-track-logging.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0008-upstream-better-message-track-logging.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0008-upstream-better-message-track-logging.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: better logging to facilitate message tracking (Wes Craig <wes at 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
+diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c 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
++++ 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
   *
@@ -63,9 +63,9 @@
  	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
+diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c 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
++++ 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
   *
@@ -82,9 +82,9 @@
  	}
      }
  
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c 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
++++ 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 $

Modified: kolab-cyrus-imapd/trunk/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -7,9 +7,9 @@
 ## DP: (Wes Craig <wes at umich.edu>)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c 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
++++ 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.
   */
@@ -31,9 +31,9 @@
      /* 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
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c 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
++++ cyrus-imapd-2.2.13/imap/mboxlist.c	2006-05-12 12:18:12.192660857 +0200
 @@ -40,7 +40,7 @@
   *
   */

Modified: kolab-cyrus-imapd/trunk/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 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
++++ 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

Modified: kolab-cyrus-imapd/trunk/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: patch to compile with MIT krb5 1.4.3 (Philip Guenther <guenther at sendmail.com>)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 /tmp/dpep.YFbKHG/cyrus-imapd-2.2.13/cmulocal/sasl2.m4
+diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 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
++++ 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

Modified: kolab-cyrus-imapd/trunk/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c 66kS/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
++++ 66kS/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;

Modified: kolab-cyrus-imapd/trunk/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c 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
++++ 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 $

Modified: kolab-cyrus-imapd/trunk/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: fix a small logical mistake in imapoptions description 
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions 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
++++ 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.

Modified: kolab-cyrus-imapd/trunk/debian/patches/0016-upstream-fix-typos.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0016-upstream-fix-typos.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0016-upstream-fix-typos.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Upstream fix for some typos in manpages for reconstruct and chk_cyrus
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 cyrus-imapd-2.2.13/man/chk_cyrus.8
 --- cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-08-06 20:04:29.000000000 +0200
-+++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-08-06 20:08:15.026586061 +0200
++++ cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-08-06 20:08:15.026586061 +0200
 @@ -40,7 +40,7 @@
  .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\" 
@@ -39,9 +39,9 @@
  May not be specified with -P.
  .SH FILES
  .TP
-diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 cyrus-imapd-2.2.13/man/reconstruct.8
 --- cyrus-imapd-2.2.13/man/reconstruct.8	2006-08-06 20:04:29.000000000 +0200
-+++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8	2006-08-06 20:10:35.754646314 +0200
++++ cyrus-imapd-2.2.13/man/reconstruct.8	2006-08-06 20:10:35.754646314 +0200
 @@ -39,7 +39,7 @@
  .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Modified: kolab-cyrus-imapd/trunk/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: return an empty string for empty body parts instead of NULL
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/charset.c /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c
+diff -urNad cyrus-imapd-2.2.13/lib/charset.c cyrus-imapd-2.2.13/lib/charset.c
 --- cyrus-imapd-2.2.13/lib/charset.c	2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c	2006-08-06 19:55:36.020854674 +0200
++++ cyrus-imapd-2.2.13/lib/charset.c	2006-08-06 19:55:36.020854674 +0200
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */

Modified: kolab-cyrus-imapd/trunk/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: use ntohl() instead of htonl() in mailbox_read_index_record()
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
 --- cyrus-imapd-2.2.13/imap/mailbox.c	2006-08-06 20:03:02.000000000 +0200
-+++ /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c	2006-08-06 20:03:13.168502599 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-08-06 20:03:13.168502599 +0200
 @@ -1,5 +1,5 @@
  /* mailbox.c -- Mailbox manipulation routines
 - * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $

Modified: kolab-cyrus-imapd/trunk/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0019-upstream-sieve_allowreferrals.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0019-upstream-sieve_allowreferrals.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Upstream: patch sieve to allow referrals
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html cyrus-imapd-2.2.13/doc/changes.html
 --- cyrus-imapd-2.2.13/doc/changes.html	2006-08-31 16:46:21.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html	2006-08-31 16:53:15.970326054 +0200
++++ cyrus-imapd-2.2.13/doc/changes.html	2006-08-31 16:53:15.970326054 +0200
 @@ -1,6 +1,6 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -40,9 +40,9 @@
  <a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
  </body>
  </html>
-diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
 --- cyrus-imapd-2.2.13/imap/backend.c	2006-08-31 16:46:21.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c	2006-08-31 16:55:26.609576327 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c	2006-08-31 16:55:26.609576327 +0200
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -115,9 +115,9 @@
  
      /* now need to authenticate to backend server,
         unless we're doing LMTP on a UNIX socket (deliver) */
-diff -urNad cyrus-imapd-2.2.13/imap/protocol.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.c cyrus-imapd-2.2.13/imap/protocol.c
 --- cyrus-imapd-2.2.13/imap/protocol.c	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c	2006-08-31 16:53:15.973325759 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.c	2006-08-31 16:53:15.973325759 +0200
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -200,9 +200,9 @@
 +      { NULL, NULL, NULL },
 +      { "LOGOUT", NULL, "OK" } }
  };
-diff -urNad cyrus-imapd-2.2.13/imap/protocol.h /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.h cyrus-imapd-2.2.13/imap/protocol.h
 --- cyrus-imapd-2.2.13/imap/protocol.h	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h	2006-08-31 16:53:15.973325759 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.h	2006-08-31 16:53:15.973325759 +0200
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -246,9 +246,9 @@
  };
  
  #endif /* _INCLUDED_PROTOCOL_H */
-diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
 --- cyrus-imapd-2.2.13/imap/saslclient.c	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c	2006-08-31 16:53:15.972325858 +0200
++++ cyrus-imapd-2.2.13/imap/saslclient.c	2006-08-31 16:53:15.972325858 +0200
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -315,9 +315,9 @@
  	else {
  	    /* unknown response */
  	    if (status) *status = buf;
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
 --- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-31 16:46:22.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions	2006-08-31 16:53:44.074560998 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-31 16:53:44.074560998 +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.
@@ -339,9 +339,9 @@
  # xxx badly worded
  { "unix_group_enable", 1, SWITCH }
  /* Should we look up groups when using auth_unix (disable this if you are
-diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in cyrus-imapd-2.2.13/timsieved/Makefile.in
 --- cyrus-imapd-2.2.13/timsieved/Makefile.in	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in	2006-08-31 16:53:15.967326349 +0200
++++ cyrus-imapd-2.2.13/timsieved/Makefile.in	2006-08-31 16:53:15.967326349 +0200
 @@ -1,5 +1,5 @@
  # Makefile.in - timsieved makefile
 -# $Id: Makefile.in,v 1.24 2004/05/28 18:03:10 rjs3 Exp $
@@ -358,9 +358,9 @@
  
  timsieved: $(OBJS) $(SERVICE)
  	$(CC) $(LDFLAGS) -o timsieved \
-diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
 --- cyrus-imapd-2.2.13/timsieved/actions.c	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c	2006-08-31 16:53:15.967326349 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c	2006-08-31 16:53:15.967326349 +0200
 @@ -1,6 +1,6 @@
  /* actions.c -- executes the commands for timsieved
   * Tim Martin
@@ -381,9 +381,9 @@
      
      /* SASL */
      if (!authenticated &&
-diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c cyrus-imapd-2.2.13/timsieved/parser.c
 --- cyrus-imapd-2.2.13/timsieved/parser.c	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c	2006-08-31 16:53:15.968326251 +0200
++++ cyrus-imapd-2.2.13/timsieved/parser.c	2006-08-31 16:53:15.968326251 +0200
 @@ -1,7 +1,7 @@
  /* parser.c -- parser used by timsieved
   * Tim Martin
@@ -499,9 +499,9 @@
        } else if (actions_setuser(username) != TIMSIEVE_OK) {
  	  *errmsg = "internal error";
  	  syslog(LOG_ERR, "error in actions_setuser()");
-diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c cyrus-imapd-2.2.13/timsieved/timsieved.c
 --- cyrus-imapd-2.2.13/timsieved/timsieved.c	2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c	2006-08-31 16:53:15.968326251 +0200
++++ cyrus-imapd-2.2.13/timsieved/timsieved.c	2006-08-31 16:53:15.968326251 +0200
 @@ -1,7 +1,7 @@
  /* timsieved.c -- main file for timsieved (sieve script accepting program)
   * Tim Martin

Modified: kolab-cyrus-imapd/trunk/debian/patches/0020-upstream-client-literal-prefix.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0020-upstream-client-literal-prefix.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0020-upstream-client-literal-prefix.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Upstream patch: Prefix client responses by C:
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c
+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-10-03 20:48:22.000000000 +0200
-+++ /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:55:16.098628728 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:55:16.098628728 +0200
 @@ -1,7 +1,7 @@
  /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
   * Ken Murchison (multi-protocol implementation)

Modified: kolab-cyrus-imapd/trunk/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Upstream: applied RFC4314 READ-ONLY logic (by murch)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
 --- cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:25:43.000000000 +0100
-+++ /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:25:48.253689109 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:25:48.253689109 +0100
 @@ -38,7 +38,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -35,9 +35,9 @@
  		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
  
      proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
-diff -urNad cyrus-imapd-2.2.13/lib/acl.h /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/lib/acl.h
+diff -urNad cyrus-imapd-2.2.13/lib/acl.h cyrus-imapd-2.2.13/lib/acl.h
 --- cyrus-imapd-2.2.13/lib/acl.h	2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/lib/acl.h	2006-11-13 19:22:53.756725336 +0100
++++ cyrus-imapd-2.2.13/lib/acl.h	2006-11-13 19:22:53.756725336 +0100
 @@ -42,7 +42,7 @@
   * Start Date: 6/28/93
   */

Modified: kolab-cyrus-imapd/trunk/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
 --- cyrus-imapd-2.2.13/imap/saslclient.c	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c	2007-02-27 05:03:11.579096512 +0100
++++ cyrus-imapd-2.2.13/imap/saslclient.c	2007-02-27 05:03:11.579096512 +0100
 @@ -39,7 +39,7 @@
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */

Modified: kolab-cyrus-imapd/trunk/debian/patches/0023-sort-illegal-dates-first.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0023-sort-illegal-dates-first.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0023-sort-illegal-dates-first.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/index.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c
+diff -urNad cyrus-imapd-2.2.13/imap/index.c cyrus-imapd-2.2.13/imap/index.c
 --- cyrus-imapd-2.2.13/imap/index.c	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c	2007-02-27 05:03:44.276846274 +0100
++++ cyrus-imapd-2.2.13/imap/index.c	2007-02-27 05:03:44.276846274 +0100
 @@ -41,7 +41,7 @@
   *
   */
@@ -43,9 +43,9 @@
  	case SORT_FROM:
  	    ret = strcmp(md1->from, md2->from);
  	    break;
-diff -urNad cyrus-imapd-2.2.13/imap/message.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
 --- cyrus-imapd-2.2.13/imap/message.c	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c	2007-02-27 05:03:44.277846175 +0100
++++ cyrus-imapd-2.2.13/imap/message.c	2007-02-27 05:03:44.277846175 +0100
 @@ -41,7 +41,7 @@
   */
  
@@ -64,9 +64,9 @@
  }
  
  /*
-diff -urNad cyrus-imapd-2.2.13/imap/message.h /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h
+diff -urNad cyrus-imapd-2.2.13/imap/message.h cyrus-imapd-2.2.13/imap/message.h
 --- cyrus-imapd-2.2.13/imap/message.h	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h	2007-02-27 05:03:44.278846076 +0100
++++ cyrus-imapd-2.2.13/imap/message.h	2007-02-27 05:03:44.278846076 +0100
 @@ -1,5 +1,5 @@
  /* message.h -- Message parsing
 - $Id: message.h,v 1.6 2003/02/13 20:15:28 rjs3 Exp $

Modified: kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad cyrus-imapd-2.2.13~/sieve/bc_eval.c cyrus-imapd-2.2.13/sieve/bc_eval.c
---- cyrus-imapd-2.2.13~/sieve/bc_eval.c	2009-09-22 18:47:23.000000000 -0300
-+++ cyrus-imapd-2.2.13/sieve/bc_eval.c	2009-09-22 18:57:26.479167505 -0300
+--- cyrus-imapd-2.2.13~/sieve/bc_eval.c	2009-09-23 09:18:50.557332445 -0300
++++ cyrus-imapd-2.2.13/sieve/bc_eval.c	2009-09-23 09:20:15.831016330 -0300
 @@ -440,7 +440,7 @@
  	int comparator=ntohl(bc[i+3].value);
  	int apart=ntohl(bc[i+4].value);
@@ -17,6 +17,15 @@
  	int isReg = (match==B_REGEX);
  	int ctag = 0;
  	regex_t *reg;
+@@ -574,7 +574,7 @@
+      
+ 	if  (match == B_COUNT)
+ 	{
+-	    sprintf(scount, "%u", count);
++	    snprintf(scount, sizeof(scount), "%u", count);
+ 	    /* search through all the data */ 
+ 	    currd=datai+2;
+ 	    for (z=0; z<numdata && !res; z++)
 @@ -608,7 +608,7 @@
  	int relation=ntohl(bc[i+2].value);
  	int comparator=ntohl(bc[i+3].value);
@@ -26,9 +35,18 @@
  	int isReg = (match==B_REGEX);
  	int ctag = 0;
  	regex_t *reg;
+@@ -689,7 +689,7 @@
+ 	
+ 	if  (match == B_COUNT )
+ 	{
+-	    sprintf(scount, "%u", count);
++	    snprintf(scount, sizeof(scount), "%u", count);
+ 	    /*search through all the data*/ 
+ 	    currd=datai+2;
+ 	    for (z=0; z<numdata && !res; z++)
 diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
---- cyrus-imapd-2.2.13~/sieve/script.c	2009-09-22 18:57:09.666668946 -0300
-+++ cyrus-imapd-2.2.13/sieve/script.c	2009-09-22 18:57:26.479167505 -0300
+--- cyrus-imapd-2.2.13~/sieve/script.c	2009-09-23 09:18:51.474832314 -0300
++++ cyrus-imapd-2.2.13/sieve/script.c	2009-09-23 09:18:51.627330879 -0300
 @@ -526,9 +526,9 @@
      if ((ret != SIEVE_OK) && interp->err) {
  	char buf[1024];
@@ -42,8 +60,8 @@
   
  	ret |= interp->execute_err(buf, interp->interp_context,
 diff -urNad cyrus-imapd-2.2.13~/sieve/sieve.y cyrus-imapd-2.2.13/sieve/sieve.y
---- cyrus-imapd-2.2.13~/sieve/sieve.y	2009-09-22 18:47:23.000000000 -0300
-+++ cyrus-imapd-2.2.13/sieve/sieve.y	2009-09-22 18:57:26.479167505 -0300
+--- cyrus-imapd-2.2.13~/sieve/sieve.y	2009-09-23 09:18:50.557332445 -0300
++++ cyrus-imapd-2.2.13/sieve/sieve.y	2009-09-23 09:18:51.627330879 -0300
 @@ -923,7 +923,7 @@
  	else if (!strcmp(r, "ne")) {return NE;}
  	else if (!strcmp(r, "eq")) {return EQ;}

Modified: kolab-cyrus-imapd/trunk/debian/patches/0090-fix-casts.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0090-fix-casts.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/0090-fix-casts.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## 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
+diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c 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
++++ 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]);
@@ -36,9 +36,9 @@
  	/* 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
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c 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
++++ cyrus-imapd-2.2.13/imap/tls.c	2006-06-08 14:28:13.259629963 +0200
 @@ -717,14 +717,22 @@
  	return (ret);
  
@@ -66,9 +66,9 @@
  	       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
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c 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
++++ 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)

Deleted: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list	2010-01-28 12:07:05 UTC (rev 1485)
@@ -1,77 +0,0 @@
-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
-0017-upstream-no-body-empty-string-instead-of-null.dpatch
-0018-upstream-ntohl-instead-of-htonl.dpatch
-# Disabled for bug #400747
-# 0019-upstream-sieve_allowreferrals.dpatch
-0020-upstream-client-literal-prefix.dpatch
-0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
-0022-upstream-dont-send-empty-literal-response.dpatch
-0023-sort-illegal-dates-first.dpatch
-0024-upstream-fix-sieve.dpatch
-0025-upstream-fix-cve-2009-3235.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
-23-configurable_idled.dpatch
-24-configurable-referrals.dpatch
-25-update_install-sh.dpatch
-26-local-getline.dpatch
-30-update_perlcalling.sh.dpatch
-35-masssievec_remove_unused_variable.dpatch
-40-rehash_fix_pathes.dpatch
-45-kolab2-annotations.dpatch
-50-fix-imclient-manpage
-61-64bit-quota.dpatch
-65-sieveshell-enhancements.dpatch
-70-fix_readme_link.dpatch
-70-allow-larger-buffers.dpatch
-72-faster-isdigit.dpatch
-75-update-imapd.conf-documentation.dpatch
-77-change-missing-sieve-notice.dpatch
-80-kbsd-no-psstrings.dpatch
-85-fix-option-passing.dpatch
-90-add-sasl-options-docs.dpatch
-# optional patch: Allow upload of mails with "From " headers
-# 82-allow-from_-header.dpatch
-99-update-autoconf.dpatch
-100-kolab-imapd.dpatch
-105-cyradm.sh.dpatch
-130-kolab-imapd-goodchars.dpatch
-140-kolab-ldap.dpatch
-150-kolab-auth_unix.dpatch
-160-kolab-imapd.folderchar.dpatch
-170-ldap-deprecated.dpatch

Modified: kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Fix all Makefile.in files as necessary
 
 @DPATCH@
-diff -urNad complete.dpatch/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/Makefile.in
+diff -urNad complete.dpatch/Makefile.in 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
++++ complete.dpatch/Makefile.in	2005-11-10 16:34:20.133821819 +0100
 @@ -41,7 +41,7 @@
  # 
  
@@ -17,9 +17,9 @@
  DISTSUBDIRS = doc
  
  srcdir = @srcdir@
-diff -urNad complete.dpatch/imap/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in
+diff -urNad complete.dpatch/imap/Makefile.in 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
++++ 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@
@@ -29,9 +29,9 @@
  LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
  
  SHELL = /bin/sh
-diff -urNad complete.dpatch/installsieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in
+diff -urNad complete.dpatch/installsieve/Makefile.in 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
++++ complete.dpatch/installsieve/Makefile.in	2005-11-10 16:34:20.134821720 +0100
 @@ -48,7 +48,7 @@
  
  DEFS = @DEFS@
@@ -41,9 +41,9 @@
  LDFLAGS = @LDFLAGS@
  
  INSTALL = @INSTALL@
-diff -urNad complete.dpatch/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in
+diff -urNad complete.dpatch/lib/Makefile.in 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
++++ complete.dpatch/lib/Makefile.in	2005-11-10 16:34:20.134821720 +0100
 @@ -62,7 +62,7 @@
  LIBS = @LIBS@
  
@@ -53,9 +53,9 @@
  LDFLAGS = @LDFLAGS@
  
  SHELL = /bin/sh
-diff -urNad complete.dpatch/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in
+diff -urNad complete.dpatch/master/Makefile.in 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
++++ 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@
@@ -65,9 +65,9 @@
  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
+diff -urNad complete.dpatch/notifyd/Makefile.in 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
++++ complete.dpatch/notifyd/Makefile.in	2005-11-10 16:34:20.135821621 +0100
 @@ -54,7 +54,7 @@
  
  DEFS = @DEFS@ @LOCALDEFS@
@@ -77,9 +77,9 @@
  LDFLAGS = @LDFLAGS@
  
  prefix = @prefix@
-diff -urNad complete.dpatch/perl/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in
+diff -urNad complete.dpatch/perl/Makefile.in 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
++++ 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)" \
@@ -92,9 +92,9 @@
  	done
  
  install::
-diff -urNad complete.dpatch/perl/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in
+diff -urNad complete.dpatch/perl/sieve/Makefile.in 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
++++ 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)" \
@@ -107,9 +107,9 @@
  	done
  
  install::
-diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in
+diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in 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
++++ 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@
  
@@ -119,9 +119,9 @@
  LDFLAGS = @LDFLAGS@
  
  SHELL = /bin/sh
-diff -urNad complete.dpatch/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in
+diff -urNad complete.dpatch/sieve/Makefile.in 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
++++ 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@
@@ -148,9 +148,9 @@
  
  distclean: clean
  	rm -f Makefile
-diff -urNad complete.dpatch/timsieved/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in
+diff -urNad complete.dpatch/timsieved/Makefile.in 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
++++ complete.dpatch/timsieved/Makefile.in	2005-11-10 16:34:20.136821523 +0100
 @@ -54,7 +54,7 @@
  
  DEFS = @DEFS@ @LOCALDEFS@

Modified: kolab-cyrus-imapd/trunk/debian/patches/02-add_mkinstalldirs.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/02-add_mkinstalldirs.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/02-add_mkinstalldirs.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,8 @@
 ## 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
+--- /dev/null
++++ b/mkinstalldirs
 @@ -0,0 +1,150 @@
 +#! /bin/sh
 +# mkinstalldirs --- make directory hierarchy

Modified: kolab-cyrus-imapd/trunk/debian/patches/03-fix_docs.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/03-fix_docs.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/03-fix_docs.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Fix FAQ and virtual domains installation docs
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/faq.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html
+diff -urNad cyrus-imapd-2.2.13/doc/faq.html cyrus-imapd-2.2.13/doc/faq.html
 --- cyrus-imapd-2.2.13/doc/faq.html	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html	2007-03-17 20:49:20.580803890 +0100
++++ cyrus-imapd-2.2.13/doc/faq.html	2007-03-17 20:49:20.580803890 +0100
 @@ -111,7 +111,7 @@
  </pre>
  
@@ -17,9 +17,9 @@
  
  </dd>
  
-diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html
+diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html cyrus-imapd-2.2.13/doc/install-virtdomains.html
 --- cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-03-17 20:49:20.581803792 +0100
++++ cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-03-17 20:49:20.581803792 +0100
 @@ -99,6 +99,10 @@
  to the <tt>defaultdomain</tt>.  See <a href=#admins>Administrators</a>
  below for further discussion.
@@ -31,9 +31,9 @@
  <p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
  options.</p>
  
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
 --- cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:15.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:20.584803499 +0100
++++ cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:20.584803499 +0100
 @@ -187,7 +187,11 @@
     mailbox that does not have a parent mailbox. */
  
@@ -59,9 +59,9 @@
  
  { "loginuseacl", 0, SWITCH }
  /* If enabled, any authentication identity which has \fBa\fR rights on a
-diff -urNad cyrus-imapd-2.2.13/man/squatter.8 /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8
+diff -urNad cyrus-imapd-2.2.13/man/squatter.8 cyrus-imapd-2.2.13/man/squatter.8
 --- cyrus-imapd-2.2.13/man/squatter.8	2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8	2007-03-17 21:01:17.739413717 +0100
++++ cyrus-imapd-2.2.13/man/squatter.8	2007-03-17 21:01:17.739413717 +0100
 @@ -83,6 +83,11 @@
  .IR cyrus.conf (5)
  .

Modified: kolab-cyrus-imapd/trunk/debian/patches/04-add_autogen.sh.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/04-add_autogen.sh.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/04-add_autogen.sh.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Add autogen.sh
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh
+diff -urNad cyrus-imapd-2.2.12/autogen.sh 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
++++ cyrus-imapd-2.2.12/autogen.sh	2005-11-11 19:47:43.571058024 +0100
 @@ -0,0 +1,77 @@
 +#!/bin/sh
 +#

Modified: kolab-cyrus-imapd/trunk/debian/patches/05-fix_programnames.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/05-fix_programnames.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/05-fix_programnames.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: program sources
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c
+diff -urNad complete.dpatch/imap/deliver.c 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
++++ complete.dpatch/imap/deliver.c	2005-11-11 15:34:00.393958651 +0100
 @@ -99,7 +99,7 @@
  static void usage()
  {
@@ -18,9 +18,9 @@
  	    " [-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
+diff -urNad complete.dpatch/imap/quota.c 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
++++ complete.dpatch/imap/quota.c	2005-11-11 15:34:00.393958651 +0100
 @@ -208,7 +208,7 @@
  void usage(void)
  {
@@ -30,9 +30,9 @@
      exit(EC_USAGE);
  }    
  
-diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c
+diff -urNad complete.dpatch/imap/reconstruct.c 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
++++ complete.dpatch/imap/reconstruct.c	2005-11-11 15:34:00.394958554 +0100
 @@ -345,8 +345,8 @@
  void usage(void)
  {
@@ -44,54 +44,54 @@
      exit(EC_USAGE);
  }    
  
-diff -urNad complete.dpatch/man/chk_cyrus.8 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8
+diff -urNad complete.dpatch/man/chk_cyrus.8 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
++++ 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
+diff -urNad complete.dpatch/man/ctl_cyrusdb.8 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
++++ 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
+diff -urNad complete.dpatch/man/ctl_deliver.8 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
++++ 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
+diff -urNad complete.dpatch/man/ctl_mboxlist.8 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
++++ 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
+diff -urNad complete.dpatch/man/cyr_expire.8 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
++++ 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
+diff -urNad complete.dpatch/man/cyrus.conf.5 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
++++ 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
@@ -144,9 +144,9 @@
 +\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
+diff -urNad complete.dpatch/man/deliver.8 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
++++ complete.dpatch/man/deliver.8	2005-11-11 15:34:00.396958358 +0100
 @@ -1,5 +1,5 @@
  .\" -*- nroff -*-
 -.TH DELIVER 8 "Project Cyrus" CMU
@@ -184,9 +184,9 @@
  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
+diff -urNad complete.dpatch/man/fud.8 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
++++ complete.dpatch/man/fud.8	2005-11-11 15:34:00.396958358 +0100
 @@ -61,7 +61,7 @@
  ]
  .SH DESCRIPTION
@@ -196,9 +196,9 @@
  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
+diff -urNad complete.dpatch/man/idled.8 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
++++ 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
@@ -214,9 +214,9 @@
  .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
+diff -urNad complete.dpatch/man/imapd.8 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
++++ 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.
@@ -232,9 +232,9 @@
  .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
+diff -urNad complete.dpatch/man/lmtpd.8 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
++++ 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.
@@ -250,9 +250,9 @@
  .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
+diff -urNad complete.dpatch/man/master.8 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
++++ complete.dpatch/man/master.8	2005-11-11 15:34:00.398958163 +0100
 @@ -1,5 +1,5 @@
  .\" -*- nroff -*-
 -.TH MASTER 8 "Project Cyrus" CMU
@@ -341,9 +341,9 @@
  .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
+diff -urNad complete.dpatch/man/nntpd.8 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
++++ 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.
@@ -359,9 +359,9 @@
  .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
+diff -urNad complete.dpatch/man/notifyd.8 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
++++ complete.dpatch/man/notifyd.8	2005-11-11 15:34:00.398958163 +0100
 @@ -62,7 +62,7 @@
  ]
  .SH DESCRIPTION
@@ -377,9 +377,9 @@
  .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
+diff -urNad complete.dpatch/man/pop3d.8 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
++++ 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.
@@ -395,9 +395,9 @@
  .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
+diff -urNad complete.dpatch/man/quota.8 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
++++ complete.dpatch/man/quota.8	2005-11-11 15:34:00.399958065 +0100
 @@ -1,5 +1,5 @@
  .\" -*- nroff -*-
 -.TH QUOTA 8 "Project Cyrus" CMU
@@ -449,9 +449,9 @@
  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
+diff -urNad complete.dpatch/man/reconstruct.8 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
++++ complete.dpatch/man/reconstruct.8	2005-11-11 15:34:00.399958065 +0100
 @@ -1,5 +1,5 @@
  .\" -*- nroff -*-
 -.TH RECONSTRUCT 8 "Project Cyrus" CMU
@@ -526,9 +526,9 @@
  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
+diff -urNad complete.dpatch/man/smmapd.8 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
++++ 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.
@@ -538,9 +538,9 @@
  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
+diff -urNad complete.dpatch/man/timsieved.8 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
++++ 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.
@@ -556,18 +556,18 @@
  .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
+diff -urNad complete.dpatch/man/tls_prune.8 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
++++ 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
+diff -urNad complete.dpatch/sieve/md5.c 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
++++ complete.dpatch/sieve/md5.c	2005-11-11 15:34:48.633248090 +0100
 @@ -31,7 +31,7 @@
  
  #include "md5global.h"

Modified: kolab-cyrus-imapd/trunk/debian/patches/06-disable_runpath.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/06-disable_runpath.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/06-disable_runpath.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: disable runpath
 
 @DPATCH@
-diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4
+diff -urNad complete.dpatch/cmulocal/cyrus.m4 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
++++ 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 at andrew.cmu.edu 6-may-1998

Modified: kolab-cyrus-imapd/trunk/debian/patches/07-update_aclocal_and_configure.in.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/07-update_aclocal_and_configure.in.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/07-update_aclocal_and_configure.in.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: update aclocal.m4 and configure.in
 
 @DPATCH@
-diff -urNad complete.dpatch/configure.in /tmp/dpep.IJ03bC/complete.dpatch/configure.in
+diff -urNad complete.dpatch/configure.in 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
++++ complete.dpatch/configure.in	2005-11-10 18:42:37.579406942 +0100
 @@ -51,6 +51,11 @@
  AC_CONFIG_HEADER(config.h)
  AC_CANONICAL_HOST

Modified: kolab-cyrus-imapd/trunk/debian/patches/08-clean_socket_closes.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/08-clean_socket_closes.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/08-clean_socket_closes.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c 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
++++ 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));
@@ -16,9 +16,9 @@
  	    close(sock);
  	    ret = NULL;
  	}
-diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c
+diff -urNad complete.dpatch/imap/fud.c 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
++++ complete.dpatch/imap/fud.c	2005-11-11 00:01:58.076164940 +0100
 @@ -158,6 +158,15 @@
      mboxlist_done();
      closelog();
@@ -35,9 +35,9 @@
      exit(code);
  }
  
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c
+diff -urNad complete.dpatch/imap/imapd.c 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
++++ complete.dpatch/imap/imapd.c	2005-11-11 00:04:47.146591300 +0100
 @@ -767,6 +767,10 @@
  #ifdef HAVE_SSL
      tls_shutdown_serverengine();
@@ -49,9 +49,9 @@
  
      cyrus_done();
  
-diff -urNad complete.dpatch/imap/lmtpd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c
+diff -urNad complete.dpatch/imap/lmtpd.c 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
++++ complete.dpatch/imap/lmtpd.c	2005-11-11 00:02:48.172254190 +0100
 @@ -553,6 +553,9 @@
  
      cyrus_done();
@@ -62,9 +62,9 @@
      exit(code);
  }
  
-diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c
+diff -urNad complete.dpatch/imap/pop3d.c 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
++++ complete.dpatch/imap/pop3d.c	2005-11-11 00:03:22.702869236 +0100
 @@ -496,6 +496,9 @@
  #endif
  
@@ -75,9 +75,9 @@
  
      exit(code);
  }
-diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c
+diff -urNad complete.dpatch/imap/proxyd.c 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
++++ complete.dpatch/imap/proxyd.c	2005-11-11 00:04:04.761746266 +0100
 @@ -1382,6 +1382,9 @@
  #endif
  

Modified: kolab-cyrus-imapd/trunk/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: into real IPv4 addresses.
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c
+diff -urNad complete.dpatch/imap/pop3d.c 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
++++ complete.dpatch/imap/pop3d.c	2005-11-11 00:15:17.166894681 +0100
 @@ -522,41 +522,6 @@
  }
  

Modified: kolab-cyrus-imapd/trunk/debian/patches/10-fix_potential_overflows.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/10-fix_potential_overflows.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/10-fix_potential_overflows.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: fix potential buffer overflows
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c
+diff -urNad complete.dpatch/imap/ctl_mboxlist.c 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
++++ complete.dpatch/imap/ctl_mboxlist.c	2005-11-10 20:38:08.142040412 +0100
 @@ -479,7 +479,7 @@
      int r = 0;
      char buf[16384];
@@ -17,9 +17,9 @@
      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
+diff -urNad complete.dpatch/imap/fud.c 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
++++ complete.dpatch/imap/fud.c	2005-11-10 20:38:44.863358638 +0100
 @@ -119,9 +119,9 @@
  
          while(1) {
@@ -33,9 +33,9 @@
  
  	    if (signals_poll() == SIGHUP) {
  		/* caught a SIGHUP, return */
-diff -urNad complete.dpatch/imap/global.c /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c
+diff -urNad complete.dpatch/imap/global.c 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
++++ complete.dpatch/imap/global.c	2005-11-10 20:40:02.897537018 +0100
 @@ -467,7 +467,7 @@
  {
      struct namespace namespace;
@@ -45,9 +45,9 @@
      int r;
  
      /* Set namespace */
-diff -urNad complete.dpatch/imap/idle_idled.c /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c
+diff -urNad complete.dpatch/imap/idle_idled.c 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
++++ 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);
@@ -63,9 +63,9 @@
      }
      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
+diff -urNad complete.dpatch/imap/index.c 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
++++ 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;
@@ -87,9 +87,9 @@
  		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
+diff -urNad complete.dpatch/imap/mboxlist.h 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
++++ complete.dpatch/imap/mboxlist.h	2005-11-10 20:43:33.110906719 +0100
 @@ -73,7 +73,7 @@
  
  /* each mailbox has the following data */
@@ -99,9 +99,9 @@
      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
+diff -urNad complete.dpatch/imap/message.c 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
++++ complete.dpatch/imap/message.c	2005-11-10 20:44:17.400567516 +0100
 @@ -795,7 +795,7 @@
      /* Save header value */
      len = hdrend - hdr;
@@ -111,9 +111,9 @@
      ibuf->end += len;
      *(ibuf->end)++ = '\r';
      *(ibuf->end)++ = '\n';
-diff -urNad complete.dpatch/imap/mupdate.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h
+diff -urNad complete.dpatch/imap/mupdate.h 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
++++ complete.dpatch/imap/mupdate.h	2005-11-10 20:44:52.257152442 +0100
 @@ -70,8 +70,8 @@
      struct buf tag, cmd, arg1, arg2, arg3;
  
@@ -125,9 +125,9 @@
      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
+diff -urNad complete.dpatch/imap/proxyd.c 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
++++ complete.dpatch/imap/proxyd.c	2005-11-10 20:46:06.823846583 +0100
 @@ -1277,7 +1277,7 @@
  		 char **envp __attribute__((unused)))
  {
@@ -137,9 +137,9 @@
      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
+diff -urNad complete.dpatch/imtest/imtest.c 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
++++ 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 */
@@ -149,9 +149,9 @@
  	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
+diff -urNad complete.dpatch/master/master.c 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
++++ complete.dpatch/master/master.c	2005-11-10 20:50:59.813138032 +0100
 @@ -222,13 +222,17 @@
      return result;
  }
@@ -172,9 +172,9 @@
  }
  
  void get_statsock(int filedes[2])
-diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c
+diff -urNad complete.dpatch/master/masterconf.c 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
++++ complete.dpatch/master/masterconf.c	2005-11-10 20:53:17.940602394 +0100
 @@ -133,7 +133,7 @@
  	} else {
  	    /* one word */
@@ -184,9 +184,9 @@
  		v[i] = *p++;
  	    }
  	}
-diff -urNad complete.dpatch/notifyd/notifyd.c /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c
+diff -urNad complete.dpatch/notifyd/notifyd.c 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
++++ 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;

Modified: kolab-cyrus-imapd/trunk/debian/patches/11-fix_syslog_prefix.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/11-fix_syslog_prefix.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/11-fix_syslog_prefix.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: log prefix.
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c
+diff -urNad complete.dpatch/imap/global.c 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
++++ complete.dpatch/imap/global.c	2005-11-11 13:13:53.042398971 +0100
 @@ -93,6 +93,9 @@
  struct cyrusdb_backend *config_ptscache_db;
  #endif
@@ -30,9 +30,9 @@
  
      /* 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
+diff -urNad complete.dpatch/ptclient/ptexpire.c 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
++++ 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);
@@ -42,9 +42,9 @@
  
      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
+diff -urNad complete.dpatch/ptclient/test.c 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
++++ complete.dpatch/ptclient/test.c	2005-11-11 13:16:19.409019154 +0100
 @@ -57,7 +57,7 @@
      cacheid=cache;
    } else
@@ -54,9 +54,9 @@
    
    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
+diff -urNad complete.dpatch/ptclient/test2.c 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
++++ complete.dpatch/ptclient/test2.c	2005-11-11 13:16:39.749020971 +0100
 @@ -46,7 +46,7 @@
  
  int main(void) {

Modified: kolab-cyrus-imapd/trunk/debian/patches/12-fix_timeout_handling.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/12-fix_timeout_handling.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/12-fix_timeout_handling.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: fixes timeout handling
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/signals.c /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c
+diff -urNad complete.dpatch/imap/signals.c 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
++++ complete.dpatch/imap/signals.c	2005-11-11 14:10:07.056723830 +0100
 @@ -50,7 +50,7 @@
  #include "xmalloc.h"
  #include "exitcodes.h"
@@ -17,9 +17,9 @@
  
  static void sighandler(int sig)
  {
-diff -urNad complete.dpatch/lib/lock.h /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h
+diff -urNad complete.dpatch/lib/lock.h 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
++++ complete.dpatch/lib/lock.h	2005-11-11 14:10:07.056723830 +0100
 @@ -53,6 +53,8 @@
  
  #include <sys/stat.h>
@@ -29,9 +29,9 @@
  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
+diff -urNad complete.dpatch/lib/lock_fcntl.c 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
++++ complete.dpatch/lib/lock_fcntl.c	2005-11-11 14:10:07.057723732 +0100
 @@ -47,11 +47,43 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -254,9 +254,9 @@
 +    return 0;
  }
  
-diff -urNad complete.dpatch/lib/lock_flock.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c
+diff -urNad complete.dpatch/lib/lock_flock.c 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
++++ 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>

Modified: kolab-cyrus-imapd/trunk/debian/patches/14-xmalloc.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/14-xmalloc.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/14-xmalloc.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Fix xmalloc usage
 
 @DPATCH@
-diff -urNad complete.dpatch/lib/map_stupidshared.c /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c
+diff -urNad complete.dpatch/lib/map_stupidshared.c 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
++++ 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>
@@ -16,9 +16,9 @@
  #include "map.h"
  #include "exitcodes.h"
  
-diff -urNad complete.dpatch/lib/xmalloc.h /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h
+diff -urNad complete.dpatch/lib/xmalloc.h 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
++++ 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

Modified: kolab-cyrus-imapd/trunk/debian/patches/15-munge_8bit.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/15-munge_8bit.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/15-munge_8bit.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Add support for munge8bit
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c
+diff -urNad complete.dpatch/imap/message.c 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
++++ complete.dpatch/imap/message.c	2005-11-10 17:02:02.658034914 +0100
 @@ -227,6 +227,7 @@
      int n;
      int sawcr = 0, sawnl;
@@ -25,9 +25,9 @@
  			/* 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
+diff -urNad complete.dpatch/imap/spool.c 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
++++ complete.dpatch/imap/spool.c	2005-11-10 17:02:02.658034914 +0100
 @@ -140,6 +140,7 @@
      state s = NAME_START;
      int r = 0;
@@ -45,9 +45,9 @@
  			/* 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
+diff -urNad complete.dpatch/lib/imapoptions 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
++++ 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. */

Modified: kolab-cyrus-imapd/trunk/debian/patches/16-fix_mib.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/16-fix_mib.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/16-fix_mib.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Fix MIB file for cyrus
 
 @DPATCH@
-diff -urNad complete.dpatch/master/CYRUS-MASTER.mib /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib
+diff -urNad complete.dpatch/master/CYRUS-MASTER.mib 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
++++ complete.dpatch/master/CYRUS-MASTER.mib	2005-11-10 17:11:15.237608454 +0100
 @@ -1,12 +1,15 @@
  CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN
  

Modified: kolab-cyrus-imapd/trunk/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad complete.dpatch/imap/xversion.sh 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
++++ 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)

Modified: kolab-cyrus-imapd/trunk/debian/patches/19-fix_tls_ssl.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/19-fix_tls_ssl.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/19-fix_tls_ssl.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Make TLS/SSL error message more informative
 
 @DPATCH@
-diff -urNad complete.dpatch/imap/tls.c /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c
+diff -urNad complete.dpatch/imap/tls.c 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
++++ 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
   */
@@ -35,9 +35,9 @@
  	    return (-1);
  	}
      }
-diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c
+diff -urNad complete.dpatch/imtest/imtest.c 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
++++ complete.dpatch/imtest/imtest.c	2005-11-11 15:31:57.244983198 +0100
 @@ -63,6 +63,7 @@
  
  #include <limits.h>
@@ -64,9 +64,9 @@
  	    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
+diff -urNad complete.dpatch/lib/imclient.c 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
++++ complete.dpatch/lib/imclient.c	2005-11-11 15:31:41.928478637 +0100
 @@ -1733,7 +1733,7 @@
  
      if (c_cert_file || c_key_file)

Modified: kolab-cyrus-imapd/trunk/debian/patches/23-configurable_idled.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/23-configurable_idled.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/23-configurable_idled.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Adds imapd.conf option to select IDLE method at runtime
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
 --- cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:56.178920138 +0200
++++ cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:56.178920138 +0200
 @@ -760,9 +760,6 @@
                            METHOD is [poll], idled or no],
  	WITH_IDLE="${withval}",WITH_IDLE="poll")
@@ -18,9 +18,9 @@
  
  dnl
  dnl see if we're compiling with NNTP support
-diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in cyrus-imapd-2.2.13/imap/Makefile.in
 --- cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:56.178920138 +0200
++++ cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:56.178920138 +0200
 @@ -47,9 +47,6 @@
  # 'local' (legacy flat file).
  SEEN=seen_db.o
@@ -50,9 +50,9 @@
  	fud smmapd reconstruct quota mbpath ipurge \
  	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
  	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-diff -urNad cyrus-imapd-2.2.13/imap/global.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c
+diff -urNad cyrus-imapd-2.2.13/imap/global.c cyrus-imapd-2.2.13/imap/global.c
 --- cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:28:28.243411698 +0200
++++ cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:28:28.243411698 +0200
 @@ -72,6 +72,7 @@
  #include "prot.h" /* for PROT_BUFSIZE */
  #include "util.h"
@@ -81,9 +81,9 @@
  	/* configure libcyrus as needed */
  	libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
  	libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
-diff -urNad cyrus-imapd-2.2.13/imap/global.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h
+diff -urNad cyrus-imapd-2.2.13/imap/global.h cyrus-imapd-2.2.13/imap/global.h
 --- cyrus-imapd-2.2.13/imap/global.h	2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h	2006-08-23 18:13:56.179920040 +0200
++++ cyrus-imapd-2.2.13/imap/global.h	2006-08-23 18:13:56.179920040 +0200
 @@ -152,4 +152,6 @@
  extern struct cyrusdb_backend *config_tlscache_db;
  extern struct cyrusdb_backend *config_ptscache_db;
@@ -91,9 +91,9 @@
 +extern struct idle_backend *config_idle;
 +
  #endif /* INCLUDED_GLOBAL_H */
-diff -urNad cyrus-imapd-2.2.13/imap/idle.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle.c cyrus-imapd-2.2.13/imap/idle.c
 --- cyrus-imapd-2.2.13/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c	2006-08-23 18:13:56.179920040 +0200
++++ cyrus-imapd-2.2.13/imap/idle.c	2006-08-23 18:13:56.179920040 +0200
 @@ -0,0 +1,87 @@
 +/* 
 + * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -182,9 +182,9 @@
 +
 +    return idle;
 +}
-diff -urNad cyrus-imapd-2.2.13/imap/idle.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h
+diff -urNad cyrus-imapd-2.2.13/imap/idle.h cyrus-imapd-2.2.13/imap/idle.h
 --- cyrus-imapd-2.2.13/imap/idle.h	2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h	2006-08-23 18:13:56.180919942 +0200
++++ cyrus-imapd-2.2.13/imap/idle.h	2006-08-23 18:13:56.180919942 +0200
 @@ -44,8 +44,7 @@
  #define IDLE_H
  
@@ -250,9 +250,9 @@
 +struct idle_backend *idle_fromname(const char *name);
  
  #endif
-diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c cyrus-imapd-2.2.13/imap/idle_idled.c
 --- cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:56.180919942 +0200
++++ cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:56.180919942 +0200
 @@ -58,8 +58,6 @@
  #include "idled.h"
  #include "global.h"
@@ -350,9 +350,9 @@
 +    &idle_idled_start,
 +    &idle_idled_done
 +};
-diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c cyrus-imapd-2.2.13/imap/idle_no.c
 --- cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-23 18:13:56.181919844 +0200
 @@ -42,23 +42,31 @@
  
  #include "idle.h"
@@ -392,9 +392,9 @@
 +    &idle_no_start,
 +    &idle_no_done
 +};
-diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c cyrus-imapd-2.2.13/imap/idle_poll.c
 --- cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-23 18:13:56.181919844 +0200
 @@ -51,15 +51,13 @@
  #include "idle.h"
  #include "global.h"
@@ -461,9 +461,9 @@
 +    &idle_poll_start,
 +    &idle_poll_done
 +};
-diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c
+diff -urNad cyrus-imapd-2.2.13/imap/version.c cyrus-imapd-2.2.13/imap/version.c
 --- cyrus-imapd-2.2.13/imap/version.c	2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c	2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/version.c	2006-08-23 18:13:56.181919844 +0200
 @@ -62,6 +62,7 @@
  #include "map.h"
  #include "lock.h"
@@ -472,9 +472,9 @@
  #include "idle.h"
  
  #ifdef USE_SIEVE
-diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
 --- cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:56.182919747 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:56.182919747 +0200
 @@ -74,6 +74,8 @@
  
  libdir = @libdir@
@@ -493,9 +493,9 @@
  
  imapopts.h: imapopts.c
  
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
 --- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:56.182919747 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:56.182919747 +0200
 @@ -248,6 +248,9 @@
  /* The password to use for authentication to the backend server hostname
     (where hostname is the short hostname of the server) - Cyrus Murder */

Modified: kolab-cyrus-imapd/trunk/debian/patches/30-update_perlcalling.sh.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/30-update_perlcalling.sh.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/30-update_perlcalling.sh.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -9,81 +9,81 @@
 ## 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
+diff -urNad 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
 --- 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
++++ 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 at 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
+diff -urNad 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
 --- 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
++++ 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
+diff -urNad 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
 --- 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
++++ 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 at 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
+diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 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
++++ 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-*-
@@ -92,9 +92,9 @@
  # 
  # 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
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 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
++++ 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-*-
@@ -103,9 +103,9 @@
  # 
  # 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
+diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen 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
++++ 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
@@ -138,18 +138,18 @@
  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
+diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/tools/config2header 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
++++ 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
@@ -182,9 +182,9 @@
  require 5;
  
  use strict;
-diff -urNad cyrus-imapd-2.2.12/tools/config2man /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man
+diff -urNad cyrus-imapd-2.2.12/tools/config2man 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
++++ 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
@@ -217,9 +217,9 @@
  require 5;
  
  use strict;
-diff -urNad cyrus-imapd-2.2.12/tools/dohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash
+diff -urNad cyrus-imapd-2.2.12/tools/dohash 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
++++ 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
@@ -254,9 +254,9 @@
  require 5;
  
  $| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec 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
++++ 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
@@ -294,9 +294,9 @@
  require 5;
  
  $| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/mkimap /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap
+diff -urNad cyrus-imapd-2.2.12/tools/mkimap 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
++++ cyrus-imapd-2.2.12/tools/mkimap	2005-05-24 22:44:39.030570089 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/usr/bin/perl
@@ -329,9 +329,9 @@
  require 5;
  
  sub read_conf {
-diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups
+diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups 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
++++ 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
@@ -372,9 +372,9 @@
  require 5;
  
  use Getopt::Long;
-diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash
+diff -urNad cyrus-imapd-2.2.12/tools/rehash 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
++++ cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:44:39.029569999 +0200
 @@ -1,4 +1,8 @@
 -#!/bin/sh
 +#!/usr/bin/perl
@@ -416,9 +416,9 @@
  require 5;
  
  $| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/translatesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve
+diff -urNad cyrus-imapd-2.2.12/tools/translatesieve 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
++++ 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-*-
@@ -449,18 +449,18 @@
  require 5;
  
  $| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/undohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash
+diff -urNad cyrus-imapd-2.2.12/tools/undohash 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
++++ 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
+diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve 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
++++ 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-*-

Modified: kolab-cyrus-imapd/trunk/debian/patches/35-masssievec_remove_unused_variable.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/35-masssievec_remove_unused_variable.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/35-masssievec_remove_unused_variable.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec 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
++++ cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:53:24.124865338 +0200
 @@ -86,7 +86,6 @@
  	    push @configs, $1;
  	}

Modified: kolab-cyrus-imapd/trunk/debian/patches/40-rehash_fix_pathes.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/40-rehash_fix_pathes.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/40-rehash_fix_pathes.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.12/tools/rehash 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
++++ cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:57:53.429121575 +0200
 @@ -170,7 +170,7 @@
  $imapdconf = shift || "/etc/imapd.conf";
  

Modified: kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: Add support for 64-bit quotas
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
 --- cyrus-imapd-2.2.13/configure.in	2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in	2007-02-24 18:46:35.598277322 +0100
++++ cyrus-imapd-2.2.13/configure.in	2007-02-24 18:46:35.598277322 +0100
 @@ -107,6 +107,15 @@
  dnl fi
  AC_C_INLINE
@@ -24,9 +24,9 @@
  CMU_C___ATTRIBUTE__
  CMU_C_FPIC
  
-diff -urNad cyrus-imapd-2.2.13/imap/append.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c
+diff -urNad cyrus-imapd-2.2.13/imap/append.c cyrus-imapd-2.2.13/imap/append.c
 --- cyrus-imapd-2.2.13/imap/append.c	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c	2007-02-24 18:46:35.599277223 +0100
++++ cyrus-imapd-2.2.13/imap/append.c	2007-02-24 18:46:35.599277223 +0100
 @@ -140,7 +140,7 @@
      if (!r) {
  	if (m.quota.limit >= 0 && quotacheck >= 0 &&
@@ -45,9 +45,9 @@
  	    quota_abort(&as->tid);
  	    mailbox_close(&as->m);
  	    r = IMAP_QUOTA_EXCEEDED;
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
 --- cyrus-imapd-2.2.13/imap/imapd.c	2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c	2007-02-24 18:46:35.602276928 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c	2007-02-24 18:46:35.602276928 +0100
 @@ -2664,10 +2664,10 @@
   	     */
   	    int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
@@ -80,9 +80,9 @@
  				mailbox.quota.used/QUOTA_UNITS,
  				mailbox.quota.limit);
  		}
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
 --- cyrus-imapd-2.2.13/imap/mailbox.c	2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c	2007-02-24 18:46:35.604276731 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2007-02-24 18:46:35.604276731 +0100
 @@ -84,6 +84,7 @@
  #include "seen.h"
  #include "util.h"
@@ -214,9 +214,9 @@
  		   newmailbox.quota_mailbox_used, newmailbox.quota.root);
  	}
      }
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h cyrus-imapd-2.2.13/imap/mailbox.h
 --- cyrus-imapd-2.2.13/imap/mailbox.h	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h	2007-02-24 18:46:35.604276731 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.h	2007-02-24 18:46:35.604276731 +0100
 @@ -45,6 +45,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -256,9 +256,9 @@
  #define OFFSET_POP3_LAST_LOGIN 40
  #define OFFSET_UIDVALIDITY 44
  #define OFFSET_DELETED 48      /* added for ACAP */
-diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
 --- cyrus-imapd-2.2.13/imap/mbdump.c	2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c	2007-02-24 18:46:35.605276633 +0100
++++ cyrus-imapd-2.2.13/imap/mbdump.c	2007-02-24 18:46:35.605276633 +0100
 @@ -507,7 +507,7 @@
  {
      struct buf file, data;
@@ -268,9 +268,9 @@
      int r = 0;
      int curfile = -1;
      const char *userid = NULL;
-diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c
+diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c cyrus-imapd-2.2.13/imap/mbexamine.c
 --- cyrus-imapd-2.2.13/imap/mbexamine.c	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c	2007-02-24 18:46:35.605276633 +0100
++++ cyrus-imapd-2.2.13/imap/mbexamine.c	2007-02-24 18:46:35.605276633 +0100
 @@ -266,7 +266,7 @@
      printf("  Minor Version: %d\n", mailbox.minor_version);
      printf("  Header Size: %ld bytes  Record Size: %ld bytes\n",
@@ -280,9 +280,9 @@
  	   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.13/imap/mboxlist.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
 --- cyrus-imapd-2.2.13/imap/mboxlist.c	2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c	2007-02-24 18:46:35.606276534 +0100
++++ cyrus-imapd-2.2.13/imap/mboxlist.c	2007-02-24 18:46:35.606276534 +0100
 @@ -2536,7 +2536,7 @@
  	r = quota_write(&mailbox.quota, tid);
  	if (r) {
@@ -292,9 +292,9 @@
  		   mailbox.quota_mailbox_used, mailbox.quota.root);
  	}
  	free(mailbox.quota.root);
-diff -urNad cyrus-imapd-2.2.13/imap/quota.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c
+diff -urNad cyrus-imapd-2.2.13/imap/quota.c cyrus-imapd-2.2.13/imap/quota.c
 --- cyrus-imapd-2.2.13/imap/quota.c	2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c	2007-02-24 18:46:35.607276436 +0100
++++ cyrus-imapd-2.2.13/imap/quota.c	2007-02-24 18:46:35.607276436 +0100
 @@ -107,7 +107,7 @@
      struct quota quota;
      int refcount;
@@ -336,9 +336,9 @@
 +	printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
      }
  }
-diff -urNad cyrus-imapd-2.2.13/imap/quota.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h
+diff -urNad cyrus-imapd-2.2.13/imap/quota.h cyrus-imapd-2.2.13/imap/quota.h
 --- cyrus-imapd-2.2.13/imap/quota.h	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h	2007-02-24 18:46:35.607276436 +0100
++++ cyrus-imapd-2.2.13/imap/quota.h	2007-02-24 18:46:35.607276436 +0100
 @@ -45,18 +45,37 @@
  #define INCLUDED_QUOTA_H
  
@@ -378,9 +378,9 @@
      int limit;			/* in QUOTA_UNITS */
  };
  
-diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c
+diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c cyrus-imapd-2.2.13/imap/quota_db.c
 --- cyrus-imapd-2.2.13/imap/quota_db.c	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c	2007-02-24 18:46:35.608276338 +0100
++++ cyrus-imapd-2.2.13/imap/quota_db.c	2007-02-24 18:46:35.608276338 +0100
 @@ -89,7 +89,7 @@
  
      switch (r) {
@@ -399,9 +399,9 @@
      r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
      
      switch (r) {
-diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c
+diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c cyrus-imapd-2.2.13/imap/reconstruct.c
 --- cyrus-imapd-2.2.13/imap/reconstruct.c	2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c	2007-02-24 18:46:35.608276338 +0100
++++ cyrus-imapd-2.2.13/imap/reconstruct.c	2007-02-24 18:46:35.608276338 +0100
 @@ -93,6 +93,7 @@
  #include "retry.h"
  #include "convert_code.h"
@@ -434,9 +434,9 @@
      *((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.13/lib/Makefile.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
 --- cyrus-imapd-2.2.13/lib/Makefile.in	2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in	2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2007-02-24 18:46:35.609276239 +0100
 @@ -87,7 +87,7 @@
  	$(srcdir)/lsort.h $(srcdir)/stristr.h \
  	$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
@@ -455,9 +455,9 @@
  
  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.13/lib/byteorder64.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.c cyrus-imapd-2.2.13/lib/byteorder64.c
 --- cyrus-imapd-2.2.13/lib/byteorder64.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c	2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.c	2007-02-24 18:46:35.609276239 +0100
 @@ -0,0 +1,95 @@
 +/* byteorder64.c -- convert 64-bit values between host and network byte order
 + * 
@@ -554,9 +554,9 @@
 +}
 +
 +#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
-diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h cyrus-imapd-2.2.13/lib/byteorder64.h
 --- cyrus-imapd-2.2.13/lib/byteorder64.h	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h	2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.h	2007-02-24 18:46:35.609276239 +0100
 @@ -0,0 +1,65 @@
 +/* byteorder64.h -- convert 64-bit values between host and network byte order
 + *
@@ -623,9 +623,9 @@
 +#endif /* WORDS_BIGENDIAN */
 +#endif /* HAVE_LONG_LONG_INT */
 +#endif /* _BYTEORDER64_H */
-diff -urNad cyrus-imapd-2.2.13/lib/prot.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c
+diff -urNad cyrus-imapd-2.2.13/lib/prot.c cyrus-imapd-2.2.13/lib/prot.c
 --- cyrus-imapd-2.2.13/lib/prot.c	2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c	2007-02-24 18:46:35.610276141 +0100
++++ cyrus-imapd-2.2.13/lib/prot.c	2007-02-24 18:46:35.610276141 +0100
 @@ -871,6 +871,11 @@
      char buf[30];
      va_start(pvar, fmt);

Modified: kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 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
++++ 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'],
@@ -53,9 +53,9 @@
    }
    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
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c 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
++++ 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)
  {
@@ -64,9 +64,9 @@
    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
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 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
++++ 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};

Modified: kolab-cyrus-imapd/trunk/debian/patches/70-allow-larger-buffers.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/70-allow-larger-buffers.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/70-allow-larger-buffers.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -7,9 +7,9 @@
 ## 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.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c cyrus-imapd-2.2.13/imap/imapparse.c
 --- cyrus-imapd-2.2.13/imap/imapparse.c	2007-02-25 21:39:04.000000000 +0100
-+++ /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c	2007-02-25 21:40:19.830078835 +0100
++++ cyrus-imapd-2.2.13/imap/imapparse.c	2007-02-25 21:40:19.830078835 +0100
 @@ -52,9 +52,9 @@
  #include "exitcodes.h"
  

Modified: kolab-cyrus-imapd/trunk/debian/patches/72-faster-isdigit.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/72-faster-isdigit.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/72-faster-isdigit.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -7,9 +7,9 @@
 ## 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
+diff -urNad cyrus-imapd-2.2.13/imap/index.c 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
++++ cyrus-imapd-2.2.13/imap/index.c	2006-05-24 14:49:15.509369880 +0200
 @@ -490,8 +490,8 @@
       */
      old = seenuids;
@@ -129,9 +129,9 @@
  			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
+diff -urNad cyrus-imapd-2.2.13/lib/util.h 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
++++ 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);

Modified: kolab-cyrus-imapd/trunk/debian/patches/75-update-imapd.conf-documentation.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/75-update-imapd.conf-documentation.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/75-update-imapd.conf-documentation.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: supported option names
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
 --- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-02 23:15:02.000000000 +0200
-+++ /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions	2006-08-02 23:17:59.362341706 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-02 23:17:59.362341706 +0200
 @@ -69,7 +69,10 @@
  \fB/etc/imapd.conf\fR file, and show each option's default value.
  Some options have no default value, these are listed with

Modified: kolab-cyrus-imapd/trunk/debian/patches/77-change-missing-sieve-notice.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/77-change-missing-sieve-notice.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/77-change-missing-sieve-notice.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: script is missing
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/sieve/script.c /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c
+diff -urNad cyrus-imapd-2.2.13/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
 --- cyrus-imapd-2.2.13/sieve/script.c	2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c	2006-08-21 23:31:25.979899091 +0200
++++ cyrus-imapd-2.2.13/sieve/script.c	2006-08-21 23:31:25.979899091 +0200
 @@ -37,6 +37,7 @@
  #include <sys/types.h>
  #include <unistd.h>

Modified: kolab-cyrus-imapd/trunk/debian/patches/80-kbsd-no-psstrings.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/80-kbsd-no-psstrings.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/80-kbsd-no-psstrings.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -5,9 +5,9 @@
 ## DP: disable PS_STRINGS for GNU/kFreeBSD
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.6LRag9/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
 --- cyrus-imapd-2.2.13/configure.in	2006-09-25 20:13:04.000000000 +0200
-+++ /tmp/dpep.6LRag9/cyrus-imapd-2.2.13/configure.in	2006-09-25 20:13:06.102258297 +0200
++++ cyrus-imapd-2.2.13/configure.in	2006-09-25 20:13:06.102258297 +0200
 @@ -297,16 +297,15 @@
  fi
  if test "$spt_type" = ""; then

Modified: kolab-cyrus-imapd/trunk/debian/patches/82-allow-from_-header.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/82-allow-from_-header.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/82-allow-from_-header.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,9 +6,9 @@
 ## DP: Outlook sometimes tries (occured with Thunderbird as well)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/message.c /tmp/dpep.hKmCze/cyrus-imapd-2.2.13/imap/message.c
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
 --- cyrus-imapd-2.2.13/imap/message.c	2007-02-25 21:28:42.000000000 +0100
-+++ /tmp/dpep.hKmCze/cyrus-imapd-2.2.13/imap/message.c	2007-02-25 21:29:40.841335772 +0100
++++ cyrus-imapd-2.2.13/imap/message.c	2007-02-25 21:29:40.841335772 +0100
 @@ -296,6 +296,7 @@
  	/* Check for valid header name */
  	if (sawnl && buf[0] != ' ' && buf[0] != '\t') {

Added: kolab-cyrus-imapd/trunk/debian/patches/99-berkelydb-4.8.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/99-berkelydb-4.8.dpatch	                        (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/99-berkelydb-4.8.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+--- a/cmulocal/berkdb.m4
++++ b/cmulocal/berkdb.m4
+@@ -213,7 +213,12 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	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.7 db4.7 db47 \
++		      db-4.8 db4.8 db48 \
++		      db-4.6 db4.6 db46 \
++		      db-4.5 db4.5 db45 \
++		      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>],
+--- a/lib/cyrusdb_berkeley.c
++++ b/lib/cyrusdb_berkeley.c
+@@ -173,7 +173,15 @@ static int init(const char *dbdir, int m
+ 	syslog(LOG_WARNING,
+ 	       "DBERROR: invalid berkeley_locks_max value, using internal default");
+     } else {
++#if DB_VERSION_MAJOR >= 4
++	r = dbenv->set_lk_max_locks(dbenv, opt);
++	if (!r)
++	    r = dbenv->set_lk_max_lockers(dbenv, opt);
++	if (!r)
++	    r = dbenv->set_lk_max_objects(dbenv, opt);
++#else
+ 	r = dbenv->set_lk_max(dbenv, opt);
++#endif
+ 	if (r) {
+ 	    dbenv->err(dbenv, r, "set_lk_max");
+ 	    syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));

Modified: kolab-cyrus-imapd/trunk/debian/patches/99-update-autoconf.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/99-update-autoconf.dpatch	2010-01-28 11:28:44 UTC (rev 1484)
+++ kolab-cyrus-imapd/trunk/debian/patches/99-update-autoconf.dpatch	2010-01-28 12:07:05 UTC (rev 1485)
@@ -6,1900 +6,8 @@
 ## DP: (64bit-quota and potentially DRAC)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.guess
---- cyrus-imapd-2.2.13/config.guess	2006-10-10 17:24:32.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.guess	2007-02-24 20:51:40.439078754 +0100
-@@ -1,8 +1,11 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
--#   Free Software Foundation, Inc.
--#
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+#   Inc.
-+
-+timestamp='2006-07-02'
-+
- # 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
-@@ -15,159 +18,293 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Written by Per Bothner <bothner at cygnus.com>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
--# Please send patches to <autoconf-patches at gnu.org>.
-+
-+# Originally written by Per Bothner <per at bothner.com>.
-+# Please send patches to <config-patches at 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 system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
-+# don't specify an explicit build system type.
- 
--# Use $HOST_CC if defined. $CC may point to a cross-compiler
--if test x"$CC_FOR_BUILD" = x; then
--  if test x"$HOST_CC" != x; then
--    CC_FOR_BUILD="$HOST_CC"
--  else
--    if test x"$CC" != x; then
--      CC_FOR_BUILD="$CC"
--    else
--      CC_FOR_BUILD=cc
--    fi
--  fi
-+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 at 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 ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # 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 "$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 ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi at noc.rutgers.edu 8/24/94.)
-+# (ghazi at 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_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
--
- # 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 ;;
-+    *:OpenBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*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.
--	cat <<EOF >$dummy.s
--	.globl main
--	.ent main
--main:
--	.frame \$30,0,\$26,0
--	.prologue 0
--	.long 0x47e03d80 # implver $0
--	lda \$2,259
--	.long 0x47e20c21 # amask $2,$1
--	srl \$1,8,\$2
--	sll \$2,2,\$2
--	sll \$0,3,\$0
--	addl \$1,\$0,\$0
--	addl \$2,\$0,\$0
--	ret \$31,(\$26),1
--	.end main
--EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		./$dummy
--		case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
--	echo m68k-cbm-sysv4
--	exit 0;;
--    amiga:NetBSD:*:*)
--      echo m68k-cbm-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	echo m68k-unknown-sysv4
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
--    arc64:OpenBSD:*:*)
--	echo mips64el-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hkmips:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
--    arm32:NetBSD:*:*)
--	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
--    SR2?01:HI-UX/MPP:*:*)
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -175,25 +312,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    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 ;;
-+	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -202,12 +346,12 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
--	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	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)
-@@ -217,19 +361,13 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
--    atari*:NetBSD:*:*)
--	echo m68k-atari-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    atari*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
--    # "atarist" or "atariste" at least should have a processor 
-+    # "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
-@@ -237,61 +375,45 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
--    sun3*:NetBSD:*:*)
--	echo m68k-sun-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:NetBSD:*:*)
--	echo m68k-apple-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-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 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:NetBSD:*:*)
--        echo powerpc-apple-netbsd${UNAME_RELEASE}
--        exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- #ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
- 	int main (int argc, char *argv[]) {
- #else
- 	int main (argc, argv) int argc; char *argv[]; {
-@@ -310,28 +432,37 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
--	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
--	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-@@ -343,31 +474,40 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
--    i?86:AIX:*:*)
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit ;;
-     *: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>
- 
-@@ -379,18 +519,21 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--		rm -f $dummy.c $dummy
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
--    *:AIX:*:4)
--	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
--	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
-+	exit ;;
-+    *:AIX:*:[45])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
- 	else
- 		IBM_ARCH=powerpc
-@@ -398,37 +541,56 @@
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
- 	else
--		IBM_REV=4.${UNAME_RELEASE}
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
--    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
- 	    9000/31? )            HP_ARCH=m68000 ;;
- 	    9000/[34]?? )         HP_ARCH=m68k ;;
- 	    9000/[678][0-9][0-9])
--              sed 's/^              //' << EOF >$dummy.c
-+		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>
- 
-@@ -459,13 +621,39 @@
-                   exit (0);
-               }
- EOF
--	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
--	rm -f $dummy.c $dummy
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
- 	esac
--	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit ;;
-     3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#include <unistd.h>
- 	int
-@@ -491,434 +679,475 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
--    *9??*:MPE/iX:*:*)
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
--    i?86:OSF1:*:*)
-+	exit ;;
-+    i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
--    hppa*:OpenBSD:*:*)
--	echo hppa-unknown-openbsd
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
--    CRAY*X-MP:*:*:*)
--	echo xmp-cray-unicos
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
--	echo ymp-cray-unicos${UNAME_RELEASE}
--	exit 0 ;;
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
--	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
--	exit 0 ;;
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     CRAY*TS:*:*:*)
--	echo t90-cray-unicos${UNAME_RELEASE}
--	exit 0 ;;
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     CRAY*T3E:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE}
--	exit 0 ;;
--    CRAY-2:*:*:*)
--	echo cray2-cray-unicos
--        exit 0 ;;
--    F300:UNIX_System_V:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
--    F301:UNIX_System_V:*:*)
--       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
--       exit 0 ;;
--    hp3[0-9][05]:NetBSD:*:*)
--	echo m68k-hp-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
--	if test -x /usr/bin/objformat; then
--	    if test "elf" = "`/usr/bin/objformat`"; then
--		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
--		exit 0
--	    fi
--	fi
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
--    *:NetBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
--	exit 0 ;;
--    *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    x86:Interix*:[3456]*)
-+	echo i586-pc-interix${UNAME_RELEASE}
-+	exit ;;
-+    EM64T:Interix*:[3456]*)
-+	echo x86_64-unknown-interix${UNAME_RELEASE}
-+	exit ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
--	exit 0 ;;
-+	echo i586-pc-interix
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
--    *:Linux:*:*)
--
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit ;;
-+    arm*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    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 | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    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 | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    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 ;;
-+    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 ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
- 	# problems with other programs or directories called `ld' in the path.
--	ld_help_string=`cd /; ld --help 2>&1`
--	ld_supported_emulations=`echo $ld_help_string \
--			 | sed -ne '/supported emulations:/!d
-+	# 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 emulations: *//
-+				    s/.*supported targets: *//
- 				    s/ .*//
- 				    p'`
--        case "$ld_supported_emulations" in
--	  *ia64)
--		echo "${UNAME_MACHINE}-unknown-linux"
--		exit 0
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
--	  i?86linux)
-+	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0
--		;;
--	  i?86coff)
-+		exit ;;
-+	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0
--		;;
--	  sparclinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  armlinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  elf32arm*)
--		echo "${UNAME_MACHINE}-unknown-linux-gnu"
--		exit 0
--		;;
--	  armelf_linux*)
--		echo "${UNAME_MACHINE}-unknown-linux-gnu"
--		exit 0
--		;;
--	  m68klinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  elf32ppc)
--		# Determine Lib Version
--		cat >$dummy.c <<EOF
--#include <features.h>
--#if defined(__GLIBC__)
--extern char __libc_version[];
--extern char __libc_release[];
--#endif
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#if defined(__GLIBC__)
--  printf("%s %s\n", __libc_version, __libc_release);
--#else
--  printf("unkown\n");
--#endif
--  return 0;
--}
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy | grep 1\.99 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi	
--		rm -f $dummy.c $dummy
--		echo powerpc-unknown-linux-gnu${LIBC}
--		exit 0
--		;;
-+		exit ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit ;;
- 	esac
--
--	if test "${UNAME_MACHINE}" = "alpha" ; then
--		sed 's/^	//'  <<EOF >$dummy.s
--		.globl main
--		.ent main
--	main:
--		.frame \$30,0,\$26,0
--		.prologue 0
--		.long 0x47e03d80 # implver $0
--		lda \$2,259
--		.long 0x47e20c21 # amask $2,$1
--		srl \$1,8,\$2
--		sll \$2,2,\$2
--		sll \$0,3,\$0
--		addl \$1,\$0,\$0
--		addl \$2,\$0,\$0
--		ret \$31,(\$26),1
--		.end main
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy
--			case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--			esac
--
--			objdump --private-headers $dummy | \
--			  grep ld.so.1 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi
--		rm -f $dummy.s $dummy
--		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
--	elif test "${UNAME_MACHINE}" = "mips" ; then
--	  cat >$dummy.c <<EOF
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __MIPSEB__
--  printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
--  printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
--  return 0;
--}
--EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	else
--	  # Either a pre-BFD a.out linker (linux-gnuoldld)
--	  # or one that does not give us useful --help.
--	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
--	  # If ld does not provide *any* "supported emulations:"
--	  # that means it is gnuoldld.
--	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
--	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--
--	  case "${UNAME_MACHINE}" in
--	  i?86)
--	    VENDOR=pc;
--	    ;;
--	  *)
--	    VENDOR=unknown;
--	    ;;
--	  esac
--	  # Determine whether the default compiler is a.out or elf
--	  cat >$dummy.c <<EOF
--#include <features.h>
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __ELF__
--# ifdef __GLIBC__
--#  if __GLIBC__ >= 2
--    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--#  else
--    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--#  endif
--# else
--   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
--  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
--  return 0;
--}
-+	# 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
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
- EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	fi ;;
--# 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.
--    i?86:DYNIX/ptx:4*:*)
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+	;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
--    i?86:UNIX_SV:4.2MP:2.*)
-+	exit ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-         # 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:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i?86:*:5:7*)
--        # Fixed at (any) Pentium or better
--        UNAME_MACHINE=i586
--        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
--	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
--	else
--	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
--	fi
--	exit 0 ;;
--    i?86:*:3.2:*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit ;;
-+    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|egrep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+		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|egrep '^Machine.*Pent ?II' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+		(/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 ;;
-+	exit ;;
-     pc:*:*:*)
-+	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+	exit ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
--    m68*:LynxOS:2.*:*)
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
--    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
--    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -926,62 +1155,155 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
--    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                           # says <Richard.M.Bartel at ccMail.Census.GOV>
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel at ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes at openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf at swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-+    *:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
--    news*:NEWS-OS:*:6*)
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-+    *: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 ;;
-     *:QNX:*:4*)
--	echo i386-qnx-qnx${UNAME_VERSION}
--	exit 0 ;;
-+	echo i386-pc-qnx
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit ;;
-+    *: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 ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
- 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>
-@@ -1007,7 +1329,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1068,11 +1390,24 @@
- #endif
- 
- #if defined (vax)
--#if !defined (ultrix)
--  printf ("vax-dec-bsd\n"); exit (0);
--#else
--  printf ("vax-dec-ultrix\n"); exit (0);
--#endif
-+# 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)
-@@ -1083,12 +1418,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1097,25 +1432,69 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
--#echo '(Unable to guess system type)' 1>&2
-+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 at 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.48WUNC/cyrus-imapd-2.2.13/config.h.in
---- cyrus-imapd-2.2.13/config.h.in	2006-04-18 18:07:03.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.h.in	2007-02-24 20:51:40.440078654 +0100
+--- a/config.h.in
++++ b/config.h.in
 @@ -85,6 +85,10 @@
  /* Define to 1 if you have the `daemon' function. */
  #undef HAVE_DAEMON
@@ -1950,7 +58,7 @@
  /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
     `char[]'. */
  #undef YYTEXT_POINTER
-@@ -496,7 +510,11 @@
+@@ -496,7 +510,11 @@ enum {
      SQUAT_ENGINE = 1,
  
      /* should we have long LMTP error messages? */
@@ -1963,1219 +71,127 @@
  };
  
  #endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.sub
---- cyrus-imapd-2.2.13/config.sub	2006-10-10 17:24:32.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.sub	2007-02-24 20:51:40.442078456 +0100
-@@ -1,6 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -1,81 +1,415 @@
  #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+#   Inc.
-+
-+timestamp='2006-09-20'
-+
- # 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.
-@@ -17,14 +22,18 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
-+# Please send patches to <config-patches at 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.
-@@ -45,30 +54,75 @@
- #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
- 
--if [ x$1 = x ]
--then
--	echo Configuration name missing. 1>&2
--	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
--	echo "or     $0 ALIAS" 1>&2
--	echo where ALIAS is a recognized configuration type. 1>&2
--	exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
- 
--# First pass through any local machine types.
--case $1 in
--	*local*)
--		echo $1
--		exit 0
--		;;
--	*)
--	;;
-+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 at 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 ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # 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 ;;
-+
-+    * )
-+       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
--  linux-gnu*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | 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/'`
-     ;;
-@@ -94,7 +148,7 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple)
-+	-apple | -axis | -knuth | -cray)
- 		os=
- 		basic_machine=$1
- 		;;
-@@ -108,9 +162,21 @@
- 		os=-vxworks
- 		basic_machine=$1
- 		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco5)
- 		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -127,6 +193,10 @@
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-sco5v6*)
-+		# 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/'`
-@@ -166,27 +236,74 @@
- case $basic_machine in
- 	# Recognize the basic CPU types without company name.
- 	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
--		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
--		| 580 | i960 | h8300 \
--		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
--		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
--		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
--		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
--		| mips64vr5000 | miprs64vr5000el | mcore \
--		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
--		| thumb | d10v | fr30)
-+	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 | avr32 \
-+	| 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 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
-+	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)
-+		;;
-+	ms1)
-+		basic_machine=mt-unknown
- 		;;
- 
- 	# 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[34567]86)
-+	i*86 | x86_64)
- 	  basic_machine=$basic_machine-pc
- 	  ;;
- 	# Object if more than one company name word.
-@@ -195,24 +312,66 @@
- 		exit 1
- 		;;
- 	# Recognize the basic CPU types with company name.
--	# FIXME: clean up the formatting here.
--	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
--	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
--	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
--	      | xmp-* | ymp-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
--	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
--	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
--	      | clipper-* | orion-* \
--	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-* \
--	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
--	      | mipstx39-* | mipstx39el-* | mcore-* \
--	      | f301-* | armv*-* | t3e-* \
--	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
--	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
-+	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-* | avr32-* \
-+	| 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-* \
-+	| m32c-* | 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-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xc16x-* | 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.
-@@ -230,6 +389,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -244,19 +406,25 @@
- 		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-cbm
-+		basic_machine=m68k-unknown
- 		;;
- 	amigaos | amigados)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-amigaos
- 		;;
- 	amigaunix | amix)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-sysv4
- 		;;
- 	apollo68)
-@@ -275,6 +443,10 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -295,27 +467,45 @@
- 		basic_machine=c38-convex
- 		os=-bsd
- 		;;
--	cray | ymp)
--		basic_machine=ymp-cray
-+	cray | j90)
-+		basic_machine=j90-cray
- 		os=-unicos
- 		;;
--	cray2)
--		basic_machine=cray2-cray
--		os=-unicos
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
- 		;;
--	[ctj]90-cray)
--		basic_machine=c90-cray
--		os=-unicos
-+	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
-@@ -324,6 +514,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -357,6 +551,10 @@
- 		basic_machine=tron-gmicro
- 		os=-sysv
- 		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
- 	h3050r* | hiux*)
- 		basic_machine=hppa1.1-hitachi
- 		os=-hiuxwe2
-@@ -432,19 +630,19 @@
- 		basic_machine=i370-ibm
- 		;;
- # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
--	i[34567]86v32)
-+	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
- 		;;
--	i[34567]86v4*)
-+	i*86v4*)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv4
- 		;;
--	i[34567]86v)
-+	i*86v)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv
- 		;;
--	i[34567]86sol2)
-+	i*86sol2)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-solaris2
- 		;;
-@@ -456,17 +654,6 @@
- 		basic_machine=i386-unknown
- 		os=-vsta
- 		;;
--	i386-go32 | go32)
--		basic_machine=i386-unknown
--		os=-go32
--		;;
--	i386-mingw32 | mingw32)
--		basic_machine=i386-unknown
--		os=-mingw32
--		;;
--	i386-qnx | qnx)
--		basic_machine=i386-qnx
--		;;
- 	iris | iris4d)
- 		basic_machine=mips-sgi
- 		case $os in
-@@ -492,6 +679,10 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -499,14 +690,6 @@
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
--	mipsel*-linux*)
--		basic_machine=mipsel-unknown
--		os=-linux-gnu
--		;;
--	mips*-linux*)
--		basic_machine=mips-unknown
--		os=-linux-gnu
--		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -517,10 +700,17 @@
- 		basic_machine=m68k-rom68k
- 		os=-coff
- 		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
- 	msdos)
--		basic_machine=i386-unknown
-+		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -582,13 +772,27 @@
- 		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
- 		;;
-+	openrisc | openrisc-*)
-+		basic_machine=or32-unknown
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
- 		os=-ose
-@@ -611,45 +815,75 @@
- 	pbb)
- 		basic_machine=m68k-tti
- 		;;
--        pc532 | pc532-*)
-+	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pentium | p5 | k5 | k6 | nexen)
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
--	pentiumpro | p6 | 6x86)
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
- 		basic_machine=i786-pc
- 		;;
--	pentium-* | p5-* | k5-* | k6-* | nexen-*)
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumpro-* | p6-* | 6x86-*)
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	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=rs6000-ibm
-+	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
-+		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -660,10 +894,30 @@
- 	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
-+		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -671,7 +925,10 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
--	sparclite-wrs)
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
- 		;;
-@@ -729,23 +986,51 @@
- 	sun386 | sun386i | roadrunner)
- 		basic_machine=i386-sun
- 		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
- 	symmetry)
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
- 	t3e)
--		basic_machine=t3e-cray
-+		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
-@@ -767,8 +1052,8 @@
- 		os=-vms
- 		;;
- 	vpp*|vx|vx-*)
--               basic_machine=f301-fujitsu
--               ;;
-+		basic_machine=f301-fujitsu
-+		;;
- 	vxworks960)
- 		basic_machine=i960-wrs
- 		os=-vxworks
-@@ -789,13 +1074,17 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
- 		;;
--        xps | xps100)
-+	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
- 	z8k-*-coff)
- 		basic_machine=z8k-unknown
- 		os=-sim
-@@ -816,32 +1105,35 @@
- 	op60c)
- 		basic_machine=hppa1.1-oki
- 		;;
--	mips)
--		if [ x$os = x-linux-gnu ]; then
--			basic_machine=mips-unknown
--		else
--			basic_machine=mips-mips
--		fi
--		;;
- 	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
- 		;;
--	sparc | sparcv9)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
--        cydra)
-+	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
- 	orion)
-@@ -856,9 +1148,8 @@
- 	pmac | pmac-mpw)
- 		basic_machine=powerpc-apple
- 		;;
--	c4x*)
--		basic_machine=c4x-none
--		os=-coff
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
- 		;;
- 	*)
- 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -912,22 +1203,49 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -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* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers*)
- 	# 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* | -mon960* | -lnews*)
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	      | -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|'`
- 		;;
-@@ -940,6 +1258,12 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
- 	-osfrose*)
- 		os=-osfrose
- 		;;
-@@ -955,14 +1279,26 @@
- 	-acis*)
- 		os=-aos
- 		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
- 	-ctix* | -uts*)
- 		os=-sysv
- 		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
- 	-ns2 )
--	        os=-nextstep2
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
- 		;;
- 	# Preserve the version number of sinix5.
- 	-sinix5.*)
-@@ -971,15 +1307,15 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
- 	-oss*)
- 		os=-sysv3
- 		;;
--        -qnx)
--		os=-qnx4
--		;;
- 	-svr4)
- 		os=-sysv4
- 		;;
-@@ -1001,8 +1337,17 @@
- 	-xenix)
- 		os=-xenix
- 		;;
--        -*mint | -*MiNT)
--	        os=-mint
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
- 		;;
- 	-none)
- 		;;
-@@ -1026,6 +1371,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1035,7 +1386,14 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        pdp11-*)
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
- 		os=-none
- 		;;
- 	*-dec | vax-*)
-@@ -1062,6 +1420,9 @@
- 	mips*-*)
- 		os=-elf
- 		;;
-+	or32-*)
-+		os=-coff
-+		;;
- 	*-tti)	# must be before sparc entry or we get the wrong os.
- 		os=-sysv3
- 		;;
-@@ -1071,9 +1432,15 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1125,25 +1492,25 @@
- 	*-next)
- 		os=-nextstep3
- 		;;
--        *-gould)
-+	*-gould)
- 		os=-sysv
- 		;;
--        *-highlevel)
-+	*-highlevel)
- 		os=-bsd
- 		;;
- 	*-encore)
- 		os=-bsd
- 		;;
--        *-sgi)
-+	*-sgi)
- 		os=-irix
- 		;;
--        *-siemens)
-+	*-siemens)
- 		os=-sysv4
- 		;;
- 	*-masscomp)
- 		os=-rtu
- 		;;
--	f301-fujitsu)
-+	f30[01]-fujitsu | f700-fujitsu)
- 		os=-uxpv
- 		;;
- 	*-rom68k)
-@@ -1206,10 +1573,16 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
--			-vxsim* | -vxworks*)
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
- 			-aux*)
-@@ -1221,12 +1594,23 @@
- 			-mpw* | -macos*)
- 				vendor=apple
- 				;;
--			-*mint | -*MiNT)
-+			-*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
-+
-+# 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.48WUNC/cyrus-imapd-2.2.13/configure
---- cyrus-imapd-2.2.13/configure	2006-04-18 18:07:03.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/configure	2007-02-24 20:51:40.485074190 +0100
-@@ -1,25 +1,54 @@
- #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.61.
++# Generated by GNU Autoconf 2.65.
++#
++#
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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.  ##
- ## --------------------- ##
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
  
 -# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++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
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do 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
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
 +esac
+ 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
 +
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in #(
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
 +fi
 +
-+
-+
-+
-+# PATH needs CR
-+# 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
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
  fi
--DUALCASE=1; export DUALCASE # for MKS sh
  
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- fi
  
- 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
 +# splitting by setting IFS to empty value.)
-+as_nl='
-+'
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
++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
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
 +IFS=$as_save_IFS
 +
 +     ;;
@@ -3186,29 +202,281 @@
 +  as_myself=$0
 +fi
 +if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  exit 1
 +fi
 +
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 +done
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
+ 
+ # 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
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test "x$CONFIG_SHELL" = x; then
++  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
++fi
++"
++  as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
++
++exitcode=0
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++  exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1"
++  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++  if (eval "$as_required") 2>/dev/null; then :
++  as_have_required=yes
++else
++  as_have_required=no
++fi
++  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
++
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ 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
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  as_found=:
++  case $as_dir in #(
++	 /*)
++	   for as_base in sh bash ksh sh5; do
++	     # Try only shells that exist, to save several forks.
++	     as_shell=$as_dir/$as_base
++	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  CONFIG_SHELL=$as_shell as_have_required=yes
++		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  break 2
++fi
++fi
++	   done;;
++       esac
++  as_found=false
++done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++  CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
++IFS=$as_save_IFS
++
++
++      if test "x$CONFIG_SHELL" != x; then :
++  # We cannot yet assume a decent shell, so we have to provide a
++	# neutralization value for shells without unset; and this also
++	# works around shells that cannot unset nonexistent variables.
++	BASH_ENV=/dev/null
++	ENV=/dev/null
++	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++    if test x$as_have_required = xno; then :
++  $as_echo "$0: This script requires a shell more modern than all"
++  $as_echo "$0: the shells that I found on your system."
++  if test x${ZSH_VERSION+set} = xset ; then
++    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++  else
++    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
    fi
- done
+-done
++  exit 1
++fi
++fi
++fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
  
- # Required to use basename.
+-# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
++
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@ -3221,22 +489,28 @@
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@
+ fi
  
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
  
- # Name of the executable.
+-# Name of the executable.
 -as_me=`$as_basename "$0" ||
 +as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
 -	 X"$0" : 'X\(/\)$' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
+-echo X/"$0" |
 -    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
@@ -3250,24 +524,15 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
  
- 
+-
 -# 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
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -83,146 +417,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+ 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
@@ -3280,36 +545,9 @@
 -    PATH_SEPARATOR=:
 -  fi
 -  rm -f conf$$.sh
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
- fi
- 
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
- 
+-fi
+-
+-
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
@@ -3326,13 +564,7 @@
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
- 
+-
 -       ;;
 -  esac
 -  # We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -3346,143 +578,19 @@
 -  fi
 -  case $CONFIG_SHELL in
 -  '')
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-     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=.
+-    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
-+  case $as_dir in
- 	 /*)
+-	 /*)
 -	   if ("$as_dir/$as_base" -c '
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+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+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+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+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
+-  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_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; }
@@ -3495,119 +603,21 @@
 -done
 -;;
 -  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # 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.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, 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
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
 -  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
 -  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  as_lineno_1=$LINENO as_lineno_1a=$LINENO
++  as_lineno_2=$LINENO as_lineno_2a=$LINENO
++  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
@@ -3629,9 +639,10 @@
 +      s/-\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; }; }
 +  chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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
@@ -3643,62 +654,61 @@
    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= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
 +ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
++case `echo -n x` in #(((((
 +-n*)
-+  case `echo 'x\c'` in
++  case `echo 'xy\c'` in
 +  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
 +  esac;;
 +*)
 +  ECHO_N='-n';;
  esac
  
 -if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
+-  as_expr=expr
++rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
-+else
+ else
+-  as_expr=false
 +  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
++  mkdir conf$$.dir 2>/dev/null
+ 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='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
+-    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
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
@@ -3707,8 +717,10 @@
 +rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -222,7 +518,28 @@
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
    as_mkdir_p=false
  fi
  
@@ -3724,12 +736,12 @@
 +  as_test_x='
 +    eval sh -c '\''
 +      if test -d "$1"; then
-+        test -d "$1/.";
++	test -d "$1/.";
 +      else
-+	case $1 in
-+        -*)set "./$1";;
++	case $1 in #(
++	-*)set "./$1";;
 +	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 +	???[sx]*):;;*)false;;esac;fi
 +    '\'' sh
 +  '
@@ -3738,7 +750,7 @@
  
  # 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'"
-@@ -231,39 +548,27 @@
+@@ -231,38 +526,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -3750,9 +762,10 @@
 -
 -# CDPATH.
 -$as_unset CDPATH
+-
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
  
-+exec 7<&0 </dev/null 6>&1
- 
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
@@ -3771,17 +784,22 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
+-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=
-@@ -275,42 +580,180 @@
+@@ -270,51 +552,239 @@ PACKAGE_TARNAME=
+ PACKAGE_VERSION=
+ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
++PACKAGE_URL=
+ 
+ ac_unique_file="imap/imapd.c"
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -3832,135 +850,182 @@
  #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
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+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
-+SET_MAKE
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CPP
-+GREP
-+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
-+YFLAGS
-+LEX
-+LEX_OUTPUT_ROOT
-+LEXLIB
-+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
++ac_subst_vars='LTLIBOBJS
 +PERL_DEPSUBDIRS
-+LTLIBOBJS'
++PERL_SUBDIRS
++IMAP_LIBS
++IMAP_COM_ERR_LIBS
++LIB_RT
++LIB_UCDSNMP
++SNMP_CONFIG
++LIB_WRAP
++CMU_LIB_SUBDIR
++SNMP_SUBDIRS
++MD5OBJ
++PERL_CCCDLFLAGS
++PERL
++SASLFLAGS
++LIB_SASL
++DYNSASLFLAGS
++LIB_DYN_SASL
++GSSAPIBASE_LIBS
++GSSAPI_LIBS
++LIB_CRYPT
++COM_ERR_CPPFLAGS
++COM_ERR_LDFLAGS
++COM_ERR_LIBS
++COMPILE_ET
++IMAP_PROGS
++WITH_IDLE
++ZEPHYR_CPPFLAGS
++ZEPHYR_LIBS
++OPENSSL_LIB
++OPENSSL_INC
++SERVER_SUBDIRS
++LDAP_LIBS
++LDAP_LDFLAGS
++LDAP_CPPFLAGS
++AFS_LDFLAGS
++AFS_LIBS
++cyrus_sigveclib
++WITH_LOCK
++WITH_MAP
++WITH_GMTOFF
++WITH_NONBLOCK
++SIEVE_SUBDIRS
++LEXLIB
++LEX_OUTPUT_ROOT
++LEX
++YFLAGS
++YACC
++SIEVE_CPPFLAGS
++SIEVE_LIBS
++SIEVE_OBJS
++CYRUSDB_OBJS
++BDB_LIB
++BDB_INC
++LOCALDEFS
++DEPLIBS
++EXTRA_SUBDIRS
++PRE_SUBDIRS
++IPV6_OBJS
++LIB_SOCKET
++LIBOBJS
++AWK
++EGREP
++GREP
++CPP
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++SET_MAKE
++RANLIB
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++cyrus_group
++cyrus_user
++service_path
++cyrus_prefix
++MAKEDEPEND
++WARNERROR
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_URL
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
  ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_warnings_are_errors
++with_extraident
++with_login
++with_cyrus_prefix
++with_service_path
++with_cyrus_user
++with_cyrus_group
++with_bdb
++with_dbdir
++with_bdb_libdir
++with_bdb_incdir
++enable_sieve
++with_lock
++with_afs
++with_ldap
++enable_krb5afspts
++enable_server
++with_krb
++with_krbimpl
++enable_statickrb
++with_krbdes
++with_openssl
++with_egd_socket
++with_zephyr
++with_pidfile
++with_idle
++enable_nntp
++enable_murder
++with_com_err
++with_syslogfacility
++enable_cmulocal
++enable_oldsievename
++enable_listext
++enable_netscapehack
++enable_gssapi
++with_gss_impl
++with_sasl
++with_staticsasl
++with_perl
++with_lib_subdir
++with_libwrap
++with_snmp
++with_ucdsnmp
++'
 +      ac_precious_vars='build_alias
 +host_alias
 +target_alias
@@ -3976,7 +1041,13 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +780,48 @@
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -337,34 +807,48 @@ x_libraries=NONE
  # 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.
@@ -4032,7 +1103,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +843,45 @@
+@@ -386,33 +870,59 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -4052,16 +1123,26 @@
 +    datarootdir=$ac_optarg ;;
 +
    -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
+-      { 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" ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=no ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=no ;;
 +
 +  -docdir | --docdir | --docdi | --doc | --do)
 +    ac_prev=docdir ;;
@@ -4074,24 +1155,33 @@
 +    dvidir=$ac_optarg ;;
  
    -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
+-      { 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
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
 -    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=\$ac_optarg ;;
++    eval enable_$ac_useropt=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +908,12 @@
+@@ -439,6 +949,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -4104,7 +1194,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +938,16 @@
+@@ -463,13 +979,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -4125,7 +1215,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1012,16 @@
+@@ -534,6 +1053,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -4142,49 +1232,101 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1074,20 @@
+@@ -584,26 +1113,36 @@ do
+     ac_init_version=: ;;
+ 
    -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
+-      { 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
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
 -    eval "with_$ac_package='$ac_optarg'" ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=\$ac_optarg ;;
++    eval with_$ac_useropt=\$ac_optarg ;;
  
    -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
+-      { 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" ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=no ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=no ;;
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1118,7 @@
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
+@@ -623,26 +1162,25 @@ do
+   | --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; }; }
++  -*) as_fn_error "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information."
+     ;;
+ 
+   *=*)
+     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'"
++    case $ac_envvar in #(
++      '' | [0-9]* | *[!_$as_cr_alnum]* )
++      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++    esac
 +    eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1138,19 @@
-    { (exit 1); exit 1; }; }
+     # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    $as_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
++      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -651,31 +1189,36 @@ 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; }; }
++  as_fn_error "missing argument to $ac_option"
  fi
  
 -# Be sure to have absolute paths.
@@ -4195,13 +1337,19 @@
 -    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
--  esac
++if test -n "$ac_unrecognized_opts"; then
++  case $enable_option_checking in
++    no) ;;
++    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
 -done
--
++fi
+ 
 -# Be sure to have absolute paths.
 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
 -	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
++# Check all directory arguments for consistency.
 +for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 +		datadir sysconfdir sharedstatedir localstatedir includedir \
 +		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -4209,6 +1357,13 @@
  do
 -  eval ac_val=$`echo $ac_var`
 +  eval ac_val=\$$ac_var
++  # Remove trailing slashes.
++  case $ac_val in
++    */ )
++      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++      eval $ac_var=\$ac_val;;
++  esac
++  # Be sure to have absolute directory names.
    case $ac_val in
 -    [\\/$]* | ?:[\\/]* ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
@@ -4216,23 +1371,29 @@
 +    [\\/$]* | ?:[\\/]* )  continue;;
 +    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
++  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1177,76 @@
+@@ -689,7 +1232,7 @@ target=$target_alias
+ 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.
++    $as_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
+@@ -702,74 +1245,72 @@ test -n "$host_alias" && ac_tool_prefix=
  test "$silent" = yes && exec 6>/dev/null
  
  
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
++  as_fn_error "working directory cannot be determined"
 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
++  as_fn_error "pwd does not report name of working directory"
 +
 +
  # Find the source files, if location was not specified.
@@ -4240,20 +1401,24 @@
    ac_srcdir_defaulted=yes
 -  # Try the directory containing this script, then its parent.
 -  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$0" : 'X\(//\)[^/]' \| \
+-	 X"$0" : 'X\(//\)$' \| \
 -	 X"$0" : 'X\(/\)' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
+-echo X"$0" |
 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 -  	  /^X\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_myself" : 'X\(//\)[^/]' \| \
++	 X"$as_myself" : 'X\(//\)$' \| \
++	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -4285,18 +1450,12 @@
 -   { (exit 1); exit 1; }; }
 -  else
 -    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
 -  fi
- 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
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
+-   { (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
@@ -4330,6 +1489,13 @@
 -ac_env_CPP_value=$CPP
 -ac_cv_env_CPP_set=${CPP+set}
 -ac_cv_env_CPP_value=$CPP
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 +	pwd)`
 +# When building in place, set srcdir=.
 +if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -4350,7 +1516,7 @@
  
  #
  # Report the --help message.
-@@ -798,9 +1275,6 @@
+@@ -798,14 +1339,11 @@ Configuration:
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -4359,49 +1525,71 @@
 -  cat <<_ACEOF
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
-@@ -818,15 +1292,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
+-			  [$ac_default_prefix]
++                          [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-			  [PREFIX]
++                          [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -815,18 +1353,25 @@ 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]
+-  --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]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
++  --bindir=DIR            user executables [EPREFIX/bin]
++  --sbindir=DIR           system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR        program executables [EPREFIX/libexec]
++  --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]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR           html documentation [DOCDIR]
++  --dvidir=DIR            dvi documentation [DOCDIR]
++  --pdfdir=DIR            pdf documentation [DOCDIR]
++  --psdir=DIR             ps documentation [DOCDIR]
  _ACEOF
  
    cat <<\_ACEOF
-@@ -844,6 +1325,7 @@
+@@ -842,8 +1387,10 @@ if test -n "$ac_init_help"; then
+   cat <<\_ACEOF
+ 
  Optional Features:
++  --disable-option-checking  ignore unrecognized --enable/--with options
    --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
-@@ -899,126 +1381,100 @@
+@@ -899,148 +1446,750 @@ Some influential environment variables:
    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>
 +  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
 +  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
@@ -4413,6 +1601,7 @@
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
  
++Report bugs to the package provider.
  _ACEOF
 +ac_status=$?
  fi
@@ -4422,21 +1611,24 @@
 -  ac_popdir=`pwd`
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 -    test -d $ac_dir || continue
-+    test -d "$ac_dir" || continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++      continue
      ac_builddir=.
  
 -if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  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 "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  case $ac_top_builddir_sub in
 +  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -4504,15 +1696,8 @@
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
+-esac
+-
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
@@ -4525,6 +1710,15 @@
 -	   test -f $ac_srcdir/configure.in; then
 -      echo
 -      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
 +    cd "$ac_dir" || { ac_status=$?; continue; }
 +    # Check for guested configure.
 +    if test -f "$ac_srcdir/configure.gnu"; then
@@ -4534,9 +1728,10 @@
 +      echo &&
 +      $SHELL "$ac_srcdir/configure" --help=recursive
      else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 -    fi
 -    cd $ac_popdir
++      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 +    fi || ac_status=$?
 +    cd "$ac_pwd" || { ac_status=$?; break; }
    done
@@ -4547,11 +1742,10 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.61
++generated by GNU Autoconf 2.65
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@ -4560,39 +1754,705 @@
  fi
 -exec 5>config.log
 -cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
+-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
+-It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
++## ------------------------ ##
++## Autoconf initialization. ##
++## ------------------------ ##
++
++# ac_fn_c_try_compile LINENO
++# --------------------------
++# Try to compile conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext
++  if { { ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compile") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
-   $ $0 $@
+-  $ $0 $@
++	ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
  
- _ACEOF
-+exec 5>>config.log
+-_ACEOF
++} # ac_fn_c_try_compile
++
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
  {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1037,7 +1493,7 @@
- /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`
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++    ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_header_compiler=yes
++else
++  ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
+-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`
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  ac_header_preproc=yes
++else
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+ 
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++  yes:no: )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+-/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`
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_compile
++
++# ac_fn_c_try_link LINENO
++# -----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_link ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext conftest$ac_exeext
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_retval=1
++fi
++  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
++  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
++  # interfere with the next link command; also delete a directory that is
++  # left behind by Apple's compiler.  We do this before executing the actions.
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_link
++
++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
++# --------------------------------------------
++# Tries to find the compile-time value of EXPR in a program that includes
++# INCLUDES, setting VAR accordingly. Returns whether the value could be
++# computed
++ac_fn_c_compute_int ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if test "$cross_compiling" = yes; then
++    # Depending upon the size, compute the lo and hi bounds.
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=$ac_mid; break
++else
++  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_lo=$ac_mid; break
++else
++  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  ac_lo= ac_hi=
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=$ac_mid
++else
++  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in #((
++?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
++'') ac_retval=1 ;;
++esac
++  else
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++static long int longval () { return $2; }
++static unsigned long int ulongval () { return $2; }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    return 1;
++  if (($2) < 0)
++    {
++      long int i = longval ();
++      if (i != ($2))
++	return 1;
++      fprintf (f, "%ld", i);
++    }
++  else
++    {
++      unsigned long int i = ulongval ();
++      if (i != ($2))
++	return 1;
++      fprintf (f, "%lu", i);
++    }
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
++else
++  ac_retval=1
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++rm -f conftest.val
++
++  fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_compute_int
++
++# ac_fn_c_check_func LINENO FUNC VAR
++# ----------------------------------
++# Tests whether FUNC exists, setting the cache variable VAR accordingly
++ac_fn_c_check_func ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $2 innocuous_$2
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $2 (); 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 $2
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $2 ();
++/* 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_$2 || defined __stub___$2
++choke me
++#endif
++
++int
++main ()
++{
++return $2 ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_func
++
++# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
++# ----------------------------------------------------
++# Tries to find if the field MEMBER exists in type AGGR, after including
++# INCLUDES, setting cache variable VAR accordingly.
++ac_fn_c_check_member ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
++$as_echo_n "checking for $2.$3... " >&6; }
++if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$5
++int
++main ()
++{
++static $2 ac_aggr;
++if (ac_aggr.$3)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$4=yes"
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$5
++int
++main ()
++{
++static $2 ac_aggr;
++if (sizeof ac_aggr.$3)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$4=yes"
++else
++  eval "$4=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$4
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_member
++
++# ac_fn_c_check_decl LINENO SYMBOL VAR
++# ------------------------------------
++# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++ac_fn_c_check_decl ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
++$as_echo_n "checking whether $2 is declared... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++#ifndef $2
++  (void) $2;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_decl
++cat >config.log <<_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.65.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++exec 5>>config.log
++{
++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`
 +/usr/bin/hostinfo      = `(/usr/bin/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`
-@@ -1051,6 +1507,7 @@
++/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
+ 
+@@ -1049,8 +2198,9 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
- done
+-  echo "PATH: $as_dir"
+-done
++    $as_echo "PATH: $as_dir"
++  done
 +IFS=$as_save_IFS
  
  } >&5
  
-@@ -1072,7 +1529,6 @@
+@@ -1072,7 +2222,6 @@ _ACEOF
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -4600,27 +2460,41 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1083,7 +1539,7 @@
+@@ -1083,13 +2232,13 @@ do
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
 -    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1105,9 +1561,7 @@
+-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+     2)
+-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      as_fn_append ac_configure_args1 " '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+ 	ac_must_keep_next=false # Got value, back to normal.
+       else
+@@ -1105,21 +2254,19 @@ do
  	  -* ) 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=" "
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
++      as_fn_append ac_configure_args " '$ac_arg'"
        ;;
      esac
    done
-@@ -1118,8 +1572,8 @@
+ 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; }
++{ ac_configure_args0=; unset ac_configure_args0;}
++{ ac_configure_args1=; unset 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.
@@ -4631,7 +2505,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1132,20 +1586,34 @@
+@@ -1132,20 +2279,35 @@ trap 'exit_status=$?
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -4642,12 +2516,13 @@
 +    case $ac_val in #(
 +    *${as_nl}*)
 +      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
 +      case $ac_var in #(
 +      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
 +      esac ;;
 +    esac
 +  done
@@ -4676,7 +2551,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1156,22 +1624,28 @@
+@@ -1156,22 +2318,28 @@ _ASBOX
      echo
      for ac_var in $ac_subst_vars
      do
@@ -4684,9 +2559,9 @@
 -      echo "$ac_var='"'"'$ac_val'"'"'"
 +      eval ac_val=\$$ac_var
 +      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +      esac
-+      echo "$ac_var='\''$ac_val'\''"
++      $as_echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
  
@@ -4706,13 +2581,13 @@
 -	echo "$ac_var='"'"'$ac_val'"'"'"
 +	eval ac_val=\$$ac_var
 +	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +	esac
-+	echo "$ac_var='\''$ac_val'\''"
++	$as_echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
-@@ -1183,26 +1657,24 @@
+@@ -1183,26 +2351,26 @@ _ASBOX
  ## ----------- ##
  _ASBOX
        echo
@@ -4721,8 +2596,10 @@
        echo
      fi
      test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
+-      echo "$as_me: caught signal $ac_signal"
+-    echo "$as_me: exit $exit_status"
++      $as_echo "$as_me: caught signal $ac_signal"
++    $as_echo "$as_me: exit $exit_status"
    } >&5
 -  rm -f core *.core &&
 -  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
@@ -4732,7 +2609,8 @@
 -     ' 0
 +' 0
  for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
  done
  ac_signal=0
  
@@ -4741,37 +2619,87 @@
 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
 -echo >confdefs.h
 +rm -f -r conftest* confdefs.h
++
++$as_echo "/* confdefs.h */" > confdefs.h
  
  # Predefined preprocessor variables.
  
-@@ -1233,14 +1705,17 @@
+@@ -1210,112 +2378,128 @@ 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
+ 
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_URL "$PACKAGE_URL"
++_ACEOF
++
+ 
  # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
+-# 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;}
++# Prefer an explicitly selected file to automatically selected ones.
++ac_site_file1=NONE
++ac_site_file2=NONE
 +if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
++  ac_site_file1=$CONFIG_SITE
 +elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
++  ac_site_file1=$prefix/share/config.site
++  ac_site_file2=$prefix/etc/config.site
 +else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
++  ac_site_file1=$ac_default_prefix/share/config.site
++  ac_site_file2=$ac_default_prefix/etc/config.site
++fi
++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 +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;}
-@@ -1256,8 +1731,8 @@
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
++  test "x$ac_site_file" = xNONE && continue
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
++$as_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;}
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
++$as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
 -      [\\/]* | ?:[\\/]* ) . $cache_file;;
 -      *)                      . ./$cache_file;;
@@ -4780,7 +2708,13 @@
      esac
    fi
  else
-@@ -1269,12 +1744,11 @@
+-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
++$as_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
@@ -4795,75 +2729,137 @@
 +  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
-@@ -1299,8 +1773,7 @@
+-      { 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;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++$as_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;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
++$as_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=:
++	# differences in whitespace do not lead to failure.
++	ac_old_val_w=`echo x $ac_old_val`
++	ac_new_val_w=`echo x $ac_new_val`
++	if test "$ac_old_val_w" != "$ac_new_val_w"; then
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	  ac_cache_corrupted=:
++	else
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
++	  eval $ac_var=\$ac_old_val
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
++$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
++$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1317,12 +1790,6 @@
-    { (exit 1); exit 1; }; }
- fi
+       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++      *) as_fn_append 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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++fi
++## -------------------- ##
++## Main body of script. ##
++## -------------------- ##
  
--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_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -1325,122 +2509,128 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
-@@ -1339,106 +1806,154 @@
- 
- 
- 
-+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_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
-+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
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
 -  elif test -f $ac_dir/install.sh; then
-+  elif test -f "$ac_dir/install.sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install.sh -c"
-     break
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
 -  elif test -f $ac_dir/shtool; then
-+  elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+-  fi
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++  for ac_t in install-sh install.sh shtool; do
++    if test -f "$ac_dir/$ac_t"; then
++      ac_aux_dir=$ac_dir
++      ac_install_sh="$ac_aux_dir/$ac_t -c"
++      break 2
++    fi
++  done
  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;}
-+  { { 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
+-   { (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.
++  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++fi
 +
 +# These three variables are undocumented and unsupported,
 +# and are intended to be withdrawn in a future Autoconf release.
@@ -4878,52 +2874,68 @@
 -$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;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
+-   { (exit 1); exit 1; }; }
+-
 -echo "$as_me:$LINENO: checking build system type" >&5
 -echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ 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
+-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" &&
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-   { { 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; }; }
+-  { { 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;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 -echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
++$as_echo_n "checking build system type... " >&6; }
++if test "${ac_cv_build+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
++  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
++$as_echo "$ac_cv_build" >&6; }
 +case $ac_cv_build in
 +*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+   { (exit 1); exit 1; }; };;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 +esac
  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; }; }
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_build
 +shift
@@ -4935,40 +2947,28 @@
 +build_os=$*
 +IFS=$ac_save_IFS
 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ 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;}
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
++$as_echo_n "checking host system type... " >&6; }
++if test "${ac_cv_host+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
 +  if test "x$host_alias" = x; then
 +  ac_cv_host=$ac_cv_build
 +else
 +  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
++    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 +fi
  
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 -echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
++$as_echo "$ac_cv_host" >&6; }
 +case $ac_cv_host in
 +*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+   { (exit 1); exit 1; }; };;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 +esac
  host=$ac_cv_host
 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -4985,23 +2985,23 @@
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
++
  
  
- 
 +WARNERROR=-W
 +# Check whether --enable-warnings-are-errors was given.
-+if test "${enable_warnings_are_errors+set}" = set; then
++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"
  
-+
 +# Check whether --with-extraident was given.
-+if test "${with_extraident+set}" = set; then
++if test "${with_extraident+set}" = set; then :
 +  withval=$with_extraident;
  cat >>confdefs.h <<_ACEOF
  #define EXTRA_IDENT "$withval"
@@ -5015,23 +3015,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1451,50 +1966,52 @@
+   if test -n "$MAKEDEPEND"; then
+   ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
+@@ -1450,51 +2640,50 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
@@ -5041,42 +3049,49 @@
  if test -n "$MAKEDEPEND"; then
 -  echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
 -echo "${ECHO_T}$MAKEDEPEND" >&6
-+  { echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-+echo "${ECHO_T}$MAKEDEPEND" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
++$as_echo "$MAKEDEPEND" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "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;}
+-        { 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;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
++$as_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 was given.
++if test "${with_login+set}" = set; then :
++  withval=$with_login; as_fn_error "--with-login is no longer supported.
++Configure SASL appropriately instead." "$LINENO" 5
  fi
  
  
 -# Check whether --with-login or --without-login was given.
-+# Check whether --with-login was given.
- if test "${with_login+set}" = set; then
+-if test "${with_login+set}" = set; then
 -  withval="$with_login"
 -  { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
-+  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; }; }
+-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;
-+fi
- 
- 
+-
+-
 -# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given.
-+
-+# Check whether --with-cyrus-prefix was given.
- if test "${with_cyrus_prefix+set}" = set; then
+-if test "${with_cyrus_prefix+set}" = set; then
 -  withval="$with_cyrus_prefix"
 -  cyrus_prefix="$withval"
++
++# Check whether --with-cyrus-prefix was given.
++if test "${with_cyrus_prefix+set}" = set; then :
 +  withval=$with_cyrus_prefix; cyrus_prefix="$withval"
  else
    cyrus_prefix="/usr/cyrus"
@@ -5086,15 +3101,16 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -1502,13 +2019,13 @@
+@@ -1502,13 +2691,13 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
 -# Check whether --with-service-path or --without-service-path was given.
-+# Check whether --with-service-path was given.
- if test "${with_service_path+set}" = set; then
+-if test "${with_service_path+set}" = set; then
 -  withval="$with_service_path"
 -  service_path="$withval"
++# Check whether --with-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"
@@ -5104,15 +3120,16 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -1516,13 +2033,13 @@
+@@ -1516,13 +2705,13 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
 -# Check whether --with-cyrus-user or --without-cyrus-user was given.
-+# Check whether --with-cyrus-user was given.
- if test "${with_cyrus_user+set}" = set; then
+-if test "${with_cyrus_user+set}" = set; then
 -  withval="$with_cyrus_user"
 -  cyrus_user="$withval"
++# Check whether --with-cyrus-user was given.
++if test "${with_cyrus_user+set}" = set; then :
 +  withval=$with_cyrus_user; cyrus_user="$withval"
  else
    cyrus_user="cyrus"
@@ -5122,15 +3139,16 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -1530,13 +2047,13 @@
+@@ -1530,13 +2719,13 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
 -# Check whether --with-cyrus-group or --without-cyrus-group was given.
-+# Check whether --with-cyrus-group was given.
- if test "${with_cyrus_group+set}" = set; then
+-if test "${with_cyrus_group+set}" = set; then
 -  withval="$with_cyrus_group"
 -  cyrus_group="$withval"
++# Check whether --with-cyrus-group was given.
++if test "${with_cyrus_group+set}" = set; then :
 +  withval=$with_cyrus_group; cyrus_group="$withval"
  else
    cyrus_group="mail"
@@ -5140,29 +3158,37 @@
  
  
  if test $sysconfdir = '${prefix}/etc'; then
-@@ -1556,8 +2073,8 @@
+@@ -1556,10 +2745,10 @@ 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
-+{ 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
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1570,32 +2087,34 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1569,35 +2758,37 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -5171,13 +3197,13 @@
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 +
@@ -5188,23 +3214,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1608,36 +2127,51 @@
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -1607,39 +2798,50 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -5213,13 +3247,13 @@
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  CC=$ac_ct_CC
@@ -5228,12 +3262,8 @@
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
@@ -5250,23 +3280,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1650,74 +2184,34 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1649,77 +2851,37 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -5313,13 +3351,13 @@
 -if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  CC=$ac_ct_CC
@@ -5334,41 +3372,52 @@
  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
-+{ 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
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1731,7 +2225,7 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1730,18 +2892,19 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-@@ -1742,6 +2236,7 @@
+      fi
+     ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1759,22 +2254,23 @@
+@@ -1759,24 +2922,25 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 +
@@ -5382,23 +3431,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1787,36 +2283,38 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1786,39 +2950,41 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -5407,13 +3464,13 @@
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 +
@@ -5429,23 +3486,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -1829,29 +2327,45 @@
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -1828,66 +2994,78 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -5454,13 +3519,13 @@
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 +
@@ -5473,12 +3538,8 @@
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
@@ -5486,99 +3547,123 @@
  fi
  
  fi
-@@ -1864,21 +2378,35 @@
-    { (exit 1); exit 1; }; }
  
+ 
+-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; }; }
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
  # Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
 -     "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+-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_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  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_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  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_try="$ac_compiler -V >&5"
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -1903,47 +2431,77 @@
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -1899,112 +3077,109 @@ main ()
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM 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
-+{ 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[^ ]*//'`
+-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
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort.  b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
+-  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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
++# The possible output files:
++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
++
 +ac_rmfiles=
 +for ac_file in $ac_files
 +do
 +  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
 +  esac
 +done
 +rm -f $ac_rmfiles
 +
-+if { (ac_try="$ac_link_default"
++if { { ac_try="$ac_link_default"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&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
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
 +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -5592,7 +3677,7 @@
 -	;;
 -    conftest.$ac_ext )
 -	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
@@ -5604,7 +3689,7 @@
 -	# but it would be cool to find out if it's true.  Does anybody
 -	# maintain Libtool? --akim.
 -	export ac_cv_exeext
-+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	then :; else
 +	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 +	fi
@@ -5621,173 +3706,297 @@
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
  else
+-  echo "$as_me: failed program was:" >&5
 +  ac_file=''
 +fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1955,19 +2513,21 @@
+-{ { 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; }; }
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  fi
- 
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
  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
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
+-# 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
-+{ 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'
+-# 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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -1986,22 +2546,27 @@
-     fi
-   fi
- fi
+-  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
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
  
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
++rm -f -r a.out a.out.dSYM 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
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
+-# 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 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
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
++if { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-@@ -2012,9 +2577,8 @@
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; 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
+@@ -2012,38 +3187,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -	  export ac_cv_exeext
  	  break;;
      * ) break;;
    esac
-@@ -2028,14 +2592,14 @@
- fi
- 
- rm -f conftest$ac_cv_exeext
+ 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
++fi
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
++$as_echo "$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
-+{ 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
-@@ -2055,14 +2619,20 @@
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
++$as_echo_n "checking for suffix of object files... " >&6; }
++if test "${ac_cv_objext+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2055,45 +3282,46 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
+-  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
++if { { ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&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
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
 +  for ac_file in conftest.o conftest.obj conftest.*; do
 +  test -f "$ac_file" || continue;
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2080,12 +2650,12 @@
+ done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_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; }; }
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
++$as_echo "$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
-+{ 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
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -2108,50 +2678,49 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2107,55 +3335,34 @@ main ()
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -5802,129 +4011,105 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
    ac_compiler_gnu=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_compiler_gnu=no
-+	ac_compiler_gnu=no
++  ac_compiler_gnu=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
 +rm -f core 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
-+{ 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`
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
++fi
  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
-+{ 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
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if test "${ac_cv_prog_cc_g+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  ac_save_c_werror_flag=$ac_c_werror_flag
 +   ac_c_werror_flag=yes
 +   ac_cv_prog_cc_g=no
 +   CFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2167,38 +2736,118 @@
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2166,39 +3373,49 @@ main ()
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
+-  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 ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
-+
+ 
+-ac_cv_prog_cc_g=no
 +  ;
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
 +
-+	ac_c_werror_flag=$ac_save_c_werror_flag
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
 +	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
@@ -5935,68 +4120,50 @@
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
-+
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
 +rm -f core 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
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$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
-@@ -2214,12 +2863,12 @@
+@@ -2214,18 +3431,14 @@ 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 "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  ac_cv_prog_cc_stdc=no
 +  ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2253,12 +2902,17 @@
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2253,12 +3466,17 @@ static char *f (char * (*g) (char **, in
  /* 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
@@ -6016,7 +4183,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2273,205 +2927,57 @@
+@@ -2273,205 +3491,37 @@ return f (e, argv, 0) != argv[0]  ||  f 
    return 0;
  }
  _ACEOF
@@ -6032,21 +4199,14 @@
 +	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
+-  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -6063,19 +4223,14 @@
 -  (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
  fi
 -rm -f conftest.err conftest.$ac_objext
-+
 +rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
@@ -6092,19 +4247,20 @@
 +# AC_CACHE_VAL
 +case "x$ac_cv_prog_cc_c89" in
 +  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
 +  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&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" ;;
 +    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
  
 -# 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
@@ -6241,7 +4397,7 @@
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
--fi
+ fi
  
 -else
 -  echo "$as_me: failed program was:" >&5
@@ -6252,29 +4408,37 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2481,8 +2987,8 @@
+@@ -2481,10 +3531,10 @@ 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
-+{ 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
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -2495,32 +3001,34 @@
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -2494,35 +3544,37 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
  fi
@@ -6283,13 +4447,13 @@
  if test -n "$RANLIB"; then
 -  echo "$as_me:$LINENO: result: $RANLIB" >&5
 -echo "${ECHO_T}$RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 +
@@ -6300,23 +4464,31 @@
  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
-+{ 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
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -2533,57 +3041,72 @@
+   if test -n "$ac_ct_RANLIB"; then
+   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+@@ -2532,58 +3584,70 @@ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+-done
++  done
 +IFS=$as_save_IFS
  
 -  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
@@ -6326,13 +4498,13 @@
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  RANLIB=$ac_ct_RANLIB
@@ -6341,12 +4513,8 @@
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    RANLIB=$ac_ct_RANLIB
@@ -6359,11 +4527,13 @@
 -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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
 +SHELL = /bin/sh
@@ -6390,29 +4560,50 @@
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
    SET_MAKE=
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2600,8 +3123,8 @@
+@@ -2600,22 +3664,23 @@ fi
  # 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
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
++# Reject install programs that cannot install multiple files.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
++$as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2623,7 +3146,7 @@
+-if test "${ac_cv_path_install+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_path_install+set}" = set; then :
++  $as_echo_n "(cached) " >&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/* | \
++    # 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\\/* | \
++  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+   /usr/ucb/* ) ;;
+   *)
+     # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -2623,7 +3688,7 @@ case $as_dir/ in
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6421,13 +4612,37 @@
  	  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.
-@@ -2642,21 +3165,22 @@
+@@ -2633,30 +3698,43 @@ case $as_dir/ in
+ 	    # 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
++	    rm -rf conftest.one conftest.two conftest.dir
++	    echo one > conftest.one
++	    echo two > conftest.two
++	    mkdir conftest.dir
++	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
++	      test -s conftest.one && test -s conftest.two &&
++	      test -s conftest.dir/conftest.one &&
++	      test -s conftest.dir/conftest.two
++	    then
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      break 3
++	    fi
+ 	  fi
+ 	fi
+       done
+     done
      ;;
  esac
- done
+-done
+ 
++  done
 +IFS=$as_save_IFS
++
++rm -rf conftest.one conftest.two conftest.dir
  
- 
  fi
    if test "${ac_cv_path_install+set}" = set; then
      INSTALL=$ac_cv_path_install
@@ -6444,40 +4659,55 @@
  fi
 -echo "$as_me:$LINENO: result: $INSTALL" >&5
 -echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
++$as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2672,8 +3196,8 @@
+@@ -2672,15 +3750,15 @@ 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
-+{ 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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -2707,24 +3231,22 @@
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test "${ac_cv_prog_CPP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -2694,11 +3772,7 @@ do
+   # <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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -2707,68 +3781,24 @@ cat >>conftest.$ac_ext <<_ACEOF
  #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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -6489,43 +4719,37 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2733,9 +3255,10 @@
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
    # 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
 +  # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2745,24 +3268,22 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -6537,50 +4761,60 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
-@@ -2773,6 +3294,7 @@
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
  ac_preproc_ok=:
  break
- fi
-+
+@@ -2778,7 +3808,7 @@ 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
++if $ac_preproc_ok; then :
+   break
+ fi
  
- done
-@@ -2790,8 +3312,8 @@
+@@ -2790,8 +3820,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:$LINENO: result: $CPP" >&5
 -echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -2814,24 +3336,22 @@
+@@ -2801,11 +3831,7 @@ do
+   # <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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -2814,68 +3840,24 @@ cat >>conftest.$ac_ext <<_ACEOF
  #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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -6592,43 +4826,37 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2840,9 +3360,10 @@
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
    # 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
 +  # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2852,24 +3373,22 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -6640,157 +4868,172 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
-@@ -2880,6 +3399,7 @@
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
  ac_preproc_ok=:
  break
- fi
-+
+@@ -2885,14 +3867,13 @@ 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
+-  :
++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; }; }
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
  
- done
-@@ -2902,24 +3422,171 @@
+ ac_ext=c
+@@ -2902,257 +3883,464 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  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 "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  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'
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
++  if test -z "$GREP"; then
 +  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
-+  for ac_prog in grep ggrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+    # Check for GNU ac_path_GREP and select it if it is found.
++    for ac_prog in grep ggrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
 +  # Check for GNU $ac_path_GREP
 +case `"$ac_path_GREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 +*)
 +  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
-+    echo 'GREP' >> "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
 +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
      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
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
-+
-+
-+    $ac_path_GREP_found && break 3
+ 
++      $ac_path_GREP_found && break 3
++    done
 +  done
-+done
-+
-+done
++  done
 +IFS=$as_save_IFS
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
++  if test -z "$ac_cv_path_GREP"; then
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
  
--echo "$as_me:$LINENO: checking for AIX" >&5
--echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-+
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+ 
+-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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++     if test -z "$EGREP"; then
 +  ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
-+  for ac_prog in egrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+    # Check for GNU ac_path_EGREP and select it if it is found.
++    for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
 +  # Check for GNU $ac_path_EGREP
 +case `"$ac_path_EGREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 +*)
 +  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
-+    echo 'EGREP' >> "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
 +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
@@ -6801,95 +5044,64 @@
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
-+
-+
-+    $ac_path_EGREP_found && break 3
+ 
++      $ac_path_EGREP_found && break 3
++    done
 +  done
-+done
-+
-+done
++  done
 +IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
++  if test -z "$ac_cv_path_EGREP"; then
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  ac_cv_path_EGREP=$EGREP
-+fi
+ fi
+-rm -f conftest*
 +
-+
 +   fi
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_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
-@@ -2933,26 +3600,25 @@
- _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
-+  { 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
-+  { 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
-+{ 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
+-if test "${ac_cv_search_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   ac_func_search_save_LIBS=$LIBS
+-  ac_func_search_save_LIBS=$LIBS
 -ac_cv_search_strerror=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -2960,115 +3626,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ();
+-char strerror ();
  int
  main ()
  {
 -strerror ();
-+return strerror ();
++
    ;
    return 0;
  }
@@ -6897,26 +5109,11 @@
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' cposix; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -6932,17 +5129,14 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_strerror="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_strerror=$ac_res
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
+-  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_exeext conftest.$ac_ext
 -if test "$ac_cv_search_strerror" = no; then
@@ -6950,26 +5144,84 @@
 -    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++rm -f core 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
++
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
--#endif
++_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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.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
 -/* 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 ()
--{
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
 -strerror ();
 -  ;
--  return 0;
--}
--_ACEOF
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
+   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
@@ -6994,110 +5246,300 @@
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_strerror="-l$ac_lib"
 -break
--else
++if ac_fn_c_try_run "$LINENO"; then :
++
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_header_stdc=no
 +fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_strerror+set}" = set; then
-+  break
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  :
-+else
-+  ac_cv_search_strerror=no
  fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
+-LIBS=$ac_func_search_save_LIBS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
  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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++# 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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
  
  fi
  
-@@ -3076,8 +3700,8 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+-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
-+{ 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
-@@ -3090,30 +3714,32 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+-    ac_cv_prog_AWK="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
  done
- done
-+IFS=$as_save_IFS
  
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
+-fi
+-fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
 -  echo "$as_me:$LINENO: result: $AWK" >&5
 -echo "${ECHO_T}$AWK" >&6
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
++
++
++  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_minix_config_h" = x""yes; then :
++  MINIX=yes
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  MINIX=
  fi
  
-+
-   test -n "$AWK" && break
- done
+-  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
-+{ 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
+-if test "${ac_cv_c_const+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test "$MINIX" = yes; then
++
++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
++
++
++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
++
++
++$as_echo "#define _MINIX 1" >>confdefs.h
++
++  fi
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -3131,10 +3757,10 @@
- #ifndef __cplusplus
-   /* Ultrix mips cc rejects this.  */
-   typedef int charset[2];
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#	  define __EXTENSIONS__ 1
++	  $ac_includes_default
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
+-#ifndef __cplusplus
+-  /* Ultrix mips cc rejects this.  */
+-  typedef int charset[2];
 -  const charset x;
-+  const charset cs;
-   /* SunOS 4.1.1 cc rejects this.  */
+-  /* 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);
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_safe_to_define___extensions__=yes
++else
++  ac_cv_safe_to_define___extensions__=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++  test $ac_cv_safe_to_define___extensions__ = yes &&
++    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
++
++  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
++
++  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
++if test "${ac_cv_search_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char strerror ();
++int
++main ()
++{
++return strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' cposix; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_strerror=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_strerror+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_strerror+set}" = set; then :
++
++else
++  ac_cv_search_strerror=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
++$as_echo "$ac_cv_search_strerror" >&6; }
++ac_res=$ac_cv_search_strerror
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AWK+set}" = set; then :
++  $as_echo_n "(cached) " >&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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AWK="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++  test -n "$AWK" && break
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++if test "${ac_cv_c_const+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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 cs;
++  /* SunOS 4.1.1 cc rejects this.  */
 +  char const *const *pcpcc;
 +  char **ppc;
-   /* NEC SVR4.0.2 mips cc rejects this.  */
-   struct point {int x, y;};
-   static struct point const zero = {0,0};
-@@ -3143,16 +3769,17 @@
-      an arm of an if-expression whose if-part is not a constant
-      expression */
-   const char *g = "string";
--  ccp = &g + (g ? g-g : 0);
++  /* 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";
 +  pcpcc = &g + (g ? g-g : 0);
    /* HPUX 7.0 cc rejects these. */
 -  ++ccp;
@@ -7115,7 +5557,7 @@
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -3171,7 +3798,9 @@
+@@ -3171,120 +4359,38 @@ main ()
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -7125,24 +5567,17 @@
  #endif
  
    ;
-@@ -3179,38 +3808,34 @@
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7157,33 +5592,30 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_const=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_c_const=no
-+	ac_cv_c_const=no
++  ac_cv_c_const=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
 +rm -f core 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
  if test $ac_cv_c_const = no; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -3219,62 +3844,8 @@
- 
- fi
- 
+-cat >>confdefs.h <<\_ACEOF
+-#define const
+-_ACEOF
+-
+-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
@@ -7230,9 +5662,10 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LONG_FILE_NAMES 1
 -_ACEOF
--
--fi
--
++$as_echo "#define const /**/" >>confdefs.h
+ 
+ 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;}
@@ -7240,29 +5673,36 @@
 -fi
 -echo "$as_me:$LINENO: checking for inline" >&5
 -echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+{ 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
+-if test "${ac_cv_c_inline+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -3294,39 +3865,37 @@
+   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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -3293,41 +4399,16 @@ $ac_kw foo_t foo () {return 0; }
+ #endif
  
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7278,19 +5718,14 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_inline=$ac_kw; break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_inline=$ac_kw
- 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
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  test "$ac_cv_c_inline" != no && break
  done
@@ -7298,47 +5733,338 @@
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 -echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
  
- 
  case $ac_cv_c_inline in
-@@ -3345,157 +3914,8 @@
+   inline | yes) ;;
+@@ -3345,18 +4426,313 @@ _ACEOF
  esac
  
  
--
++# The cast to long int 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
++$as_echo_n "checking size of long long int... " >&6; }
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"; then :
++
++else
++  if test "$ac_cv_type_long_long_int" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long long int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long_long_int=0
++   fi
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
++$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++# The cast to long int 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5
++$as_echo_n "checking size of unsigned long long int... " >&6; }
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int"        "$ac_includes_default"; then :
++
++else
++  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (unsigned long long int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_unsigned_long_long_int=0
++   fi
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++$as_echo "$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
++
++$as_echo "#define HAVE_LONG_LONG_INT /**/" >>confdefs.h
++
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_c_bigendian=unknown
++    # See if we're dealing with a universal compiler.
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifndef __APPLE_CC__
++	       not a universal capable compiler
++	     #endif
++	     typedef int dummy;
++
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++	# Check for potential -arch flags.  It is not universal unless
++	# there are at least two -arch flags with different values.
++	ac_arch=
++	ac_prev=
++	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++	 if test -n "$ac_prev"; then
++	   case $ac_word in
++	     i?86 | x86_64 | ppc | ppc64)
++	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++		 ac_arch=$ac_word
++	       else
++		 ac_cv_c_bigendian=universal
++		 break
++	       fi
++	       ;;
++	   esac
++	   ac_prev=
++	 elif test "x$ac_word" = "x-arch"; then
++	   ac_prev=arch
++	 fi
++       done
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if sys/param.h defines the BYTE_ORDER macro.
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++	     #include <sys/param.h>
++
++int
++main ()
++{
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++		     && LITTLE_ENDIAN)
++	      bogus endian macros
++	     #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_bigendian=yes
++else
++  ac_cv_c_bigendian=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <limits.h>
++
++int
++main ()
++{
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++	      bogus endian macros
++	     #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  # It does; now see whether it defined to _BIG_ENDIAN or not.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <limits.h>
++
++int
++main ()
++{
++#ifndef _BIG_ENDIAN
++		 not big endian
++		#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_bigendian=yes
++else
++  ac_cv_c_bigendian=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # Compile a test program.
++      if test "$cross_compiling" = yes; then :
++  # Try to guess by grepping values from an object file.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++short int ascii_mm[] =
++		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++		short int ascii_ii[] =
++		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++		int use_ascii (int i) {
++		  return ascii_mm[i] + ascii_ii[i];
++		}
++		short int ebcdic_ii[] =
++		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++		short int ebcdic_mm[] =
++		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++		int use_ebcdic (int i) {
++		  return ebcdic_mm[i] + ebcdic_ii[i];
++		}
++		extern int foo;
+ 
 -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
--
++int
++main ()
++{
++return use_ascii (foo) == use_ebcdic (foo);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; 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
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
+ 
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++	     /* Are we little or big endian?  From Harbison&Steele.  */
++	     union
++	     {
++	       long int l;
++	       char c[sizeof (long int)];
++	     } u;
++	     u.l = 1;
++	     return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
++}
+ _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
++if ac_fn_c_try_run "$LINENO"; then :
++  ac_cv_c_bigendian=no
++else
++  ac_cv_c_bigendian=yes
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
++$as_echo "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++   yes)
++     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
++;; #(
++   no)
++      ;; #(
++   universal)
++
++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
++
++     ;; #(
++   *)
++     as_fn_error "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ esac
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
++$as_echo_n "checking for __attribute__... " >&6; }
++if test "${ac_cv___attribute__+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <stdlib.h>
+@@ -3377,62 +4753,32 @@ foo(void)
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -7361,58 +6087,58 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv___attribute__=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv___attribute__=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv___attribute__=no
--fi
++  ac_cv___attribute__=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--if test "$ac_cv___attribute__" = "yes"; then
--
++rm -f core 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
++$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h
+ 
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
 -echo "${ECHO_T}$ac_cv___attribute__" >&6
--
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
++$as_echo "$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"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -fPIC" >&5
++$as_echo_n "checking if compiler supports -fPIC... " >&6; }
++if test "${ac_cv_fpic+set}" = set; then :
++  $as_echo_n "(cached) " >&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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <stdlib.h>
+@@ -3451,36 +4797,12 @@ foo(void)
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -7435,52 +6161,71 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_fpic=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_fpic=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv_fpic=no
--fi
++  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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$save_CFLAGS
+ 
+ fi
+@@ -3490,6332 +4812,1890 @@ if test "$ac_cv_fpic" = "yes"; then
+ else
+     FPIC_CFLAGS=""
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
 -echo "${ECHO_T}$ac_cv_fpic" >&6
--
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
++$as_echo "$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
-+{ 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
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++# The cast to long int 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -3519,35 +3939,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-  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 ()
+-{
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7495,115 +6240,272 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
+-  ac_cv_header_stdc=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
++fi
  
 -ac_cv_header_stdc=no
-+	ac_cv_header_stdc=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
+ 
+-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.  */
 +
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <string.h>
  
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3603,6 +4019,7 @@
- cat >>conftest.$ac_ext <<_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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _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>
++done
+ 
++for ac_func in memmove strcasecmp ftruncate strerror
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
++
+ else
+-  ac_cv_header_stdc=no
++  case " $LIBOBJS " in
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ ;;
++esac
++
+ fi
+-rm -f conftest*
++done
++
++
++for ac_func in strlcat strlcpy
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
+ fi
++done
+ 
+-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
+-  :
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3622,18 +4039,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
+-#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
++#include <sys/types.h>
++#include <$ac_hdr>
+ 
+-#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);
-+      return 2;
++if ((DIR *) 0)
++return 0;
++  ;
 +  return 0;
  }
  _ACEOF
- rm -f conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3646,12 +4072,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$as_ac_Header=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 )
+-ac_cv_header_stdc=no
++  eval "$as_ac_Header=no"
  fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+
-+
- fi
- fi
+-fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ 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
+-if test $ac_cv_header_stdc = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
++eval ac_res=\$$as_ac_Header
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
  
- cat >>confdefs.h <<\_ACEOF
-@@ -3674,9 +4102,9 @@
- 		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_header_dirent=$ac_hdr; break
+ 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3690,38 +4118,35 @@
- #include <$ac_header>
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
+ 
+-#include <$ac_header>
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char opendir ();
++int
++main ()
++{
++return opendir ();
++  ;
++  return 0;
++}
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7618,76 +6520,100 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
++for ac_lib in '' dir; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_opendir=$ac_res
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then :
++  break
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3732,9 +4157,9 @@
- done
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
  
++else
++  ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-done
+-
++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 "$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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3744,61 +4169,57 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+typedef long long int ac__type_new_;
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char opendir ();
  int
  main ()
  {
 -if ((long *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
+-  return 0;
 -if (sizeof (long))
-+if (sizeof (ac__type_new_))
-   return 0;
+-  return 0;
++return opendir ();
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7703,78 +6629,107 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_long=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_type_long_long_int=yes
++for ac_lib in '' x; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_opendir=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
++
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
 -ac_cv_type_long=no
-+	ac_cv_type_long_long_int=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+rm -f core 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
-+# The cast to long int 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.
-+{ 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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++	save_LIBS="$LIBS"
++	LIB_SOCKET=""
++	ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
++  :
  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
-@@ -3808,10 +4229,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-  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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+   typedef long long int ac__type_sizeof_;
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
  int
  main ()
  {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
+-test_array [0] = 0
+-
++return gethostbyname ();
    ;
-@@ -3819,27 +4241,22 @@
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -7789,154 +6744,97 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -3849,10 +4266,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-  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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_nsl_gethostbyname=yes
++else
++  ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++  LIB_SOCKET="-lnsl $LIB_SOCKET"
++fi
++
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+   typedef long long int ac__type_sizeof_;
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char connect ();
  int
  main ()
  {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
+-test_array [0] = 0
+-
++return connect ();
    ;
-@@ -3860,56 +4278,154 @@
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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
-+   typedef long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
-+   typedef long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_hi=$ac_mid; break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_lo=$ac_mid; break
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_connect=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_socket_connect=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
++$as_echo "$ac_cv_lib_socket_connect" >&6; }
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
++  LIB_SOCKET="-lsocket $LIB_SOCKET"
++fi
++
  
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
@@ -7944,437 +6842,133 @@
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -cat >conftest.$ac_ext <<_ACEOF
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core 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
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	LIBS="$LIB_SOCKET $save_LIBS"
++	ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
++if test "x$ac_cv_func_res_search" = x""yes; then :
++  :
++else
++  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+   typedef long long int ac__type_sizeof_;
+-$ac_includes_default
++
++#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 ()
  {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
+-test_array [0] = 0
++
++const char host[12]="openafs.org";
++u_char ans[1024];
++res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
++return 0;
  
    ;
-@@ -3917,28 +4433,236 @@
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long_long_int=$ac_lo;;
-+'') if test "$ac_cv_type_long_long_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long long int)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long_long_int=0
-+   fi ;;
-+esac
-+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
-+   typedef long long int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  ac_hi=-1 ac_mid=-1
-+  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 )
-+if test "$ac_cv_type_long_long_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long long int)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long_long_int=0
-+   fi
+-  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
++if ac_fn_c_try_link "$LINENO"; then :
++  LIB_SOCKET="-lresolv $LIB_SOCKET"
 +fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+-  ;
+-  return 0;
+-}
 +fi
-+rm -f conftest.val
-+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
-+typedef unsigned long long int ac__type_new_;
-+int
-+main ()
-+{
-+if ((ac__type_new_ *) 0)
-+  return 0;
-+if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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; }
-+
-+# The cast to long int 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.
-+{ 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 "$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
-+   typedef unsigned long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3947,10 +4671,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+   typedef unsigned long long int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -3958,50 +4683,139 @@
- }
++	LIBS="$LIB_SOCKET $save_LIBS"
++	for ac_func in dn_expand dns_lookup
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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
-+   typedef unsigned long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
-+   typedef unsigned long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  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
@@ -8382,65 +6976,77 @@
 -			 break
 -		       fi
 -		       ac_mid=`expr 2 '*' $ac_mid`
-+	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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++done
  
 -ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-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
++	LIBS="$save_LIBS"
 +
-+rm -f core 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`
-@@ -4012,10 +4826,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
++
++LIBS="$LIBS ${LIB_SOCKET}"
++
++cyrus_cv_getaddrinfo=yes
++
++ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
++if test "x$ac_cv_func_getaddrinfo" = x""yes; then :
++    ac_cv_lib_socket_getaddrinfo=no
++  ac_cv_lib_inet6_getaddrinfo=no
++
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
++$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+   typedef unsigned long long int ac__type_sizeof_;
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getaddrinfo ();
  int
  main ()
  {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
+-test_array [0] = 0
+-
++return getaddrinfo ();
    ;
-@@ -4023,52 +4838,45 @@
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -8455,38 +7061,36 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
+-  ac_hi=$ac_mid
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_getaddrinfo=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
++  ac_cv_lib_socket_getaddrinfo=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
+-done
+-case $ac_lo in
 -?*) ac_cv_sizeof_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
-+'') if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
- See \`config.log' for more details." >&5
+-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)
- See \`config.log' for more details." >&2;}
+-See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_unsigned_long_long_int=0
-+   fi ;;
- esac
+-esac
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
++$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
++if test "x$ac_cv_lib_socket_getaddrinfo" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++
  else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -8494,199 +7098,216 @@
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
--else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4076,8 +4884,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        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
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$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
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
++$as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
+-$ac_includes_default
 -long longval () { return (long) (sizeof (long)); }
 -unsigned long ulongval () { return (long) (sizeof (long)); }
-+   typedef unsigned long long int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getaddrinfo ();
  int
-@@ -4086,177 +4895,874 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
+ main ()
+ {
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
 -    exit (1);
 -  if (((long) (sizeof (long))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
+-    {
 -      long i = longval ();
 -      if (i != ((long) (sizeof (long))))
 -	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
 -      unsigned long i = ulongval ();
 -      if (i != ((long) (sizeof (long))))
 -	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
+-      fprintf (f, "%lu\n", i);
+-    }
 -  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
+-
++return getaddrinfo ();
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  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`
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_getaddrinfo=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 )
+-  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
-+if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
- See \`config.log' for more details." >&5
+-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)
- See \`config.log' for more details." >&2;}
+-See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
++  ac_cv_lib_inet6_getaddrinfo=no
+ fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_unsigned_long_long_int=0
-+   fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
++$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
++if test "x$ac_cv_lib_inet6_getaddrinfo" = x""yes; then :
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
  fi
- rm -f conftest.val
+-rm -f conftest.val
 -else
 -  ac_cv_sizeof_long=0
--fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
  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
+-cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG $ac_cv_sizeof_long
-+#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
  
++fi
  
-+if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
-+        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++fi
++rm -f conftest*
  
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LONG_LONG_INT
-+_ACEOF
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
  
 -   # 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>
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
  
 -    # first, try -R
 -    SAVE_LDFLAGS="${LDFLAGS}"
 -    LDFLAGS="-R /usr/lib"
 -    cat >conftest.$ac_ext <<_ACEOF
-+int
-+main ()
-+{
-+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+ bogus endian macros
-+#endif
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        ipv6_cv_getaddrinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getaddrinfo = yes; then
 +
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
++ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
++if test "x$ac_cv_func_gai_strerror" = x""yes; then :
++    ac_cv_lib_socket_gai_strerror=no
++  ac_cv_lib_inet6_gai_strerror=no
++
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -lsocket" >&5
++$as_echo_n "checking for gai_strerror in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/param.h>
  
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gai_strerror ();
  int
  main ()
  {
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
- 
+-
++return gai_strerror ();
    ;
    return 0;
  }
@@ -8694,289 +7315,94 @@
 -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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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 int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int 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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+
-+  /* Are we little or big endian?  From Harbison&Steele.  */
-+  union
-+  {
-+    long int l;
-+    char c[sizeof (long int)];
-+  } u;
-+  u.l = 1;
-+  return u.c[sizeof (long int) - 1] == 1;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  andrew_runpath_switch="-R"
-+  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
++if ac_fn_c_try_link "$LINENO"; 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 core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
 +fi
-+
-+
-+fi
-+
-+rm -f core 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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv___attribute__=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gai_strerror" >&5
++$as_echo "$ac_cv_lib_socket_gai_strerror" >&6; }
++if test "x$ac_cv_lib_socket_gai_strerror" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
  
-+	ac_cv___attribute__=no
-+fi
- 
 -  	LDFLAGS="-Wl,-rpath,/usr/lib"
 -    cat >conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&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
-+
-+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
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$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
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -linet6" >&5
++$as_echo_n "checking for gai_strerror in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&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
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-+#include <stdlib.h>
-+
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gai_strerror ();
  int
  main ()
  {
- 
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+
+-
++return gai_strerror ();
    ;
    return 0;
  }
@@ -8984,523 +7410,134 @@
 -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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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
-+typedef long ac__type_new_;
-+int
-+main ()
-+{
-+if ((ac__type_new_ *) 0)
-+  return 0;
-+if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core 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; }
-+
-+# The cast to long int 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.
-+{ 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 "$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
-+   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
-+   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  andrew_runpath_switch="-Wl,-rpath,"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=$ac_mid; break
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_gai_strerror=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_inet6_gai_strerror=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gai_strerror" >&5
++$as_echo "$ac_cv_lib_inet6_gai_strerror" >&6; }
++if test "x$ac_cv_lib_inet6_gai_strerror" = x""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
  
 -andrew_runpath_switch="none"
-+	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_exeext conftest.$ac_ext
- 
-+rm -f core 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
++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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
++#include <netdb.h>
 +
-+  ;
-+  return 0;
-+}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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
-+   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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`
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then :
++  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gai_strerror" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+ 
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  LDFLAGS="${SAVE_LDFLAGS}"
  
-+rm -f core 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
 -echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
 -echo "${ECHO_T}$andrew_runpath_switch" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core 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
-+   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') if test "$ac_cv_type_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi ;;
-+esac
-+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
-+   typedef long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 )
-+if test "$ac_cv_type_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+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"
-+
++rm -f conftest*
  
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
  
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
  
-@@ -4265,18 +5771,19 @@
- 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`
++        ipv6_cv_gai_strerror=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_gai_strerror = yes; then
+ 
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
+-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
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cyrus_cv_getaddrinfo=no
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
  else
-   # Is the header compilable?
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ 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
-@@ -4287,41 +5794,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -9515,52 +7552,39 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  cyrus_cv_getaddrinfo=no
++fi
  
 -ac_header_compiler=no
-+	ac_header_compiler=no
++if test $cyrus_cv_getaddrinfo = no; then
++	IPV6_OBJS="getaddrinfo.o"
  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
-+
-+rm -f core 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?
+-# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ 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
-@@ -4330,24 +5833,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -9568,34 +7592,58 @@
 -  else
 -    ac_cpp_err=
 -  fi
--else
++cyrus_cv_getnameinfo=yes
++
++ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
++if test "x$ac_cv_func_getnameinfo" = x""yes; then :
++    ac_cv_lib_socket_getnameinfo=no
++  ac_cv_lib_inet6_getnameinfo=no
++
+ else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
+-  ac_header_preproc=yes
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
++$as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   echo "$as_me: failed program was:" >&5
-@@ -4355,9 +5856,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4381,25 +5883,19 @@
- 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;}
+-# 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
 -## ------------------------------------------ ##
@@ -9604,92 +7652,158 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getnameinfo ();
++int
++main ()
++{
++return getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_getnameinfo=yes
  else
-   eval "$as_ac_Header=\$ac_header_preproc"
+-  eval "$as_ac_Header=\$ac_header_preproc"
++  ac_cv_lib_socket_getnameinfo=no
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+-
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
++$as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
++if test "x$ac_cv_lib_socket_getnameinfo" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
  
++else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&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
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4418,9 +5914,9 @@
- for ac_func in memmove strcasecmp ftruncate strerror
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-
+-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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$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
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
++$as_echo_n "checking for getnameinfo in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4446,80 +5942,70 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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.  */
  
- #undef $ac_func
- 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
+    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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
--#ifdef __cplusplus
+ #ifdef __cplusplus
 -}
++extern "C"
  #endif
- 
+-
++char getnameinfo ();
  int
  main ()
  {
 -return f != $ac_func;
-+return $ac_func ();
++return getnameinfo ();
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -9704,112 +7818,172 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_getnameinfo=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_inet6_getnameinfo=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
++$as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
++if test "x$ac_cv_lib_inet6_getnameinfo" = x""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
  
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++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
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++if test $ipv6_cv_getnameinfo = no; then
++  if test getnameinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <netdb.h>
  
- else
+-else
 -  case $LIBOBJS in
 -    "$ac_func.$ac_objext"   | \
 -  *" $ac_func.$ac_objext"   | \
 -    "$ac_func.$ac_objext "* | \
-+  case " $LIBOBJS " in
-   *" $ac_func.$ac_objext "* ) ;;
+-  *" $ac_func.$ac_objext "* ) ;;
 -  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-+ ;;
- esac
+-esac
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
++  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
  
  fi
-@@ -4531,9 +6017,9 @@
- for ac_func in strlcat strlcpy
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-done
+ 
++fi
++rm -f conftest*
+ 
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
+ 
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
+-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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4559,68 +6045,60 @@
+-  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
++        ipv6_cv_getnameinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getnameinfo = yes; then
  
- #undef $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.  */
++$as_echo "#define HAVE_GETNAMEINFO /**/" >>confdefs.h
  
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++else
++  cyrus_cv_getnameinfo=no
++fi
+ 
+-#undef $ac_func
++if test $cyrus_cv_getnameinfo = no; then
++	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++fi
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
  
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5
++$as_echo_n "checking whether you have ss_family in struct sockaddr_storage... " >&6; }
++if test "${ipv6_cv_ss_family+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
  int
  main ()
  {
 -return f != $ac_func;
-+return $ac_func ();
++struct sockaddr_storage ss; int i = ss.ss_family;
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -9824,63 +7998,83 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ipv6_cv_ss_family=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++  ipv6_cv_ss_family=no
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -4637,9 +6115,9 @@
- 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`
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-done
+-
+-
+-
++if test $ipv6_cv_ss_family = yes; then
+ 
++$as_echo "#define HAVE_SS_FAMILY /**/" >>confdefs.h
+ 
++else
++  :
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_ss_family" >&5
++$as_echo "$ipv6_cv_ss_family" >&6; }
+ 
+-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 "$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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have sa_len in struct sockaddr" >&5
++$as_echo_n "checking whether you have sa_len in struct sockaddr... " >&6; }
++if test "${ipv6_cv_sa_len+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4661,38 +6139,35 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+-#include <$ac_hdr>
+-
++#include <sys/socket.h>
+ int
+ main ()
+ {
+-if ((DIR *) 0)
+-return 0;
++struct sockaddr sa; int i = sa.sa_len;
+   ;
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -9895,65 +8089,85 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
+-  eval "$as_ac_Header=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ipv6_cv_sa_len=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
++  ipv6_cv_sa_len=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++if test $ipv6_cv_sa_len = yes; then
 +
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++$as_echo "#define HAVE_SOCKADDR_SA_LEN /**/" >>confdefs.h
++
++else
++  :
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_sa_len" >&5
++$as_echo "$ipv6_cv_sa_len" >&6; }
++
++
++
++for ac_header in sys/time.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_time_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -4704,13 +6179,12 @@
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++#define HAVE_SYS_TIME_H 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
+-# 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
-+  { 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
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   ac_func_search_save_LIBS=$LIBS
+-  ac_func_search_save_LIBS=$LIBS
 -ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4718,126 +6192,83 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ();
+-char opendir ();
  int
  main ()
  {
 -opendir ();
-+return opendir ();
++if ((struct tm *) 0)
++return 0;
    ;
    return 0;
  }
@@ -9961,26 +8175,11 @@
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -9996,17 +8195,22 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_opendir=$ac_res
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_time=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_header_time=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
++
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
  
--fi
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test "$ac_cv_search_opendir" = no; then
@@ -10017,7 +8221,16 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
++$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
++if test "${ac_cv_struct_tm+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <time.h>
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -10026,14 +8239,17 @@
 -/* 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 ()
--{
+ int
+ main ()
+ {
 -opendir ();
--  ;
--  return 0;
--}
--_ACEOF
++struct tm tm;
++				     int *p = &tm.tm_sec;
++				     return !p;
+   ;
+   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
@@ -10058,72 +8274,96 @@
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="-l$ac_lib"
 -break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_struct_tm=time.h
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then
-+  break
+-
++  ac_cv_struct_tm=sys/time.h
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
+-LIBS=$ac_func_search_save_LIBS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
++$as_echo "$ac_cv_struct_tm" >&6; }
++if test $ac_cv_struct_tm = sys/time.h; then
++
++$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
++
  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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++"
++if test "x$ac_cv_member_struct_tm_tm_zone" = x""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
++
++$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
++
  else
 -  echo "$as_me:$LINENO: checking for library containing opendir" >&5
 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+  { 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
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
++"
++if test "x$ac_cv_have_decl_tzname" = x""yes; then :
++  ac_have_decl=1
  else
-   ac_func_search_save_LIBS=$LIBS
+-  ac_func_search_save_LIBS=$LIBS
 -ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_TZNAME $ac_have_decl
  _ACEOF
-@@ -4845,115 +6276,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
++$as_echo_n "checking for tzname... " >&6; }
++if test "${ac_cv_var_tzname+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <time.h>
++#if !HAVE_DECL_TZNAME
++extern char *tzname[];
  #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 ();
+-char opendir ();
++
  int
  main ()
  {
 -opendir ();
-+return opendir ();
++return tzname[0][0];
    ;
    return 0;
  }
@@ -10131,26 +8371,11 @@
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10166,17 +8391,24 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_opendir=$ac_res
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_var_tzname=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_var_tzname=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
++$as_echo "$ac_cv_var_tzname" >&6; }
++  if test $ac_cv_var_tzname = yes; then
  
--fi
++$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
++
++  fi
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test "$ac_cv_search_opendir" = no; then
@@ -10203,7 +8435,19 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++
++
++
++
++
++for ac_func in vprintf
++do :
++  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
++if test "x$ac_cv_func_vprintf" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_VPRINTF 1
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
@@ -10231,100 +8475,195 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
++
++ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
++if test "x$ac_cv_func__doprnt" = x""yes; then :
++
++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
  
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then
-+  break
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
+-fi
+-LIBS=$ac_func_search_save_LIBS
++
  fi
-+rm conftest.$ac_ext
- 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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++done
++
++
++
  
++CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++
++
++
++# Check whether --with-bdb was given.
++if test "${with_bdb+set}" = set; then :
++  withval=$with_bdb; with_bdb=$withval
++else
++  with_bdb="yes"
  fi
  
-@@ -4963,8 +6352,8 @@
++
++
++# Check whether --with-dbdir was given.
++if test "${with_dbdir+set}" = set; then :
++  withval=$with_dbdir; with_bdb=$withval
+ fi
  
- 	save_LIBS="$LIBS"
- 	LIB_SOCKET=""
+ 
++case "$with_bdb" in
++  no)
++	use_berkeley="no"
++	;;
++  yes)
++	use_berkeley="yes"
++	with_bdb_lib=none
++	with_bdb_inc=none
++	;;
+ 
+-	save_LIBS="$LIBS"
+-	LIB_SOCKET=""
 -	echo "$as_me:$LINENO: checking for connect" >&5
 -echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+	{ 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
+-if test "${ac_cv_func_connect+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  *)
++	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 was given.
++if test "${with_bdb_libdir+set}" = set; then :
++  withval=$with_bdb_libdir; with_bdb_lib=$withval
  else
-@@ -4991,73 +6380,64 @@
+-  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
++   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
++fi
  
- #undef 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
++# Check whether --with-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
+ 
+-#undef connect
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_connect || defined __stub___connect
- choke me
+-choke me
 -#else
 -char (*f) () = connect;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
  
++
++
++	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
++
++	                ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
++if test "x$ac_cv_header_db_h" = x""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.7 db4.7 db47 \
++		      db-4.8 db4.8 db48 \
++		      db-4.6 db4.6 db46 \
++		      db-4.5 db4.5 db45 \
++		      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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <db.h>
  int
  main ()
  {
 -return f != connect;
-+return connect ();
++db_create(NULL, NULL, 0);
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10339,76 +8678,70 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_connect=yes
+-  ac_cv_func_connect=yes
++if ac_fn_c_try_link "$LINENO"; 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
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_connect=no
-+	ac_cv_func_connect=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++  dblib="no"
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ 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
+-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
-+  { 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
-@@ -5070,62 +6450,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-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
++rm -f core 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ();
+-char gethostbyname ();
++#include <db.h>
  int
  main ()
  {
 -gethostbyname ();
-+return gethostbyname ();
++db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10423,78 +8756,71 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_nsl_gethostbyname=yes
+-  ac_cv_lib_nsl_gethostbyname=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_nsl_gethostbyname=no
-+	ac_cv_lib_nsl_gethostbyname=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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"
+-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+-  LIB_SOCKET="-lnsl $LIB_SOCKET"
++  dblib="no"
  fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++        fi
++	LIBS=$saved_LIBS
++
++	LDFLAGS=$BDB_SAVE_LDFLAGS
  
 -		echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+		{ 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
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5138,56 +6515,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+-  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.  */
++  dblib="no"
++fi
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char connect ();
+-int
+-main ()
+-{
 -connect ();
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10509,95 +8835,91 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_socket_connect=no
-+	ac_cv_lib_socket_connect=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
-@@ -5196,8 +6570,8 @@
- fi
- 
- 	LIBS="$LIB_SOCKET $save_LIBS"
+-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
-+	{ 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
-@@ -5224,68 +6598,59 @@
- 
- #undef res_search
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_res_search || defined __stub___res_search
- choke me
+-choke me
 -#else
 -char (*f) () = res_search;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != res_search;
-+return res_search ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10612,49 +8934,57 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_res_search=no
-+	ac_cv_func_res_search=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
-@@ -5318,34 +6683,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10669,89 +8999,87 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   LIB_SOCKET="-lresolv $LIB_SOCKET"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
+-  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 \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- fi
-@@ -5356,9 +6719,9 @@
- for ac_func in dn_expand dns_lookup
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-      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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -5384,68 +6747,60 @@
- 
- #undef $ac_func
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10766,95 +9094,97 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -5461,8 +6816,8 @@
- 
- cyrus_cv_getaddrinfo=yes
- 
+-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
-+{ 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
-@@ -5489,75 +6844,66 @@
- 
- #undef getaddrinfo
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_getaddrinfo || defined __stub___getaddrinfo
- choke me
+-choke me
 -#else
 -char (*f) () = getaddrinfo;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != getaddrinfo;
-+return getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10869,78 +9199,60 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_getaddrinfo=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_func_getaddrinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_getaddrinfo=no
-+	ac_cv_func_getaddrinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-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
-+    { 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
-@@ -5570,63 +6916,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char getaddrinfo ();
+-int
+-main ()
+-{
 -getaddrinfo ();
-+return getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -10955,101 +9267,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_socket_getaddrinfo=no
-+	ac_cv_lib_socket_getaddrinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
+-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
-+      { 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
-@@ -5636,8 +6979,8 @@
- 	fi
-       done
- fi
+-    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
-+    { 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
-@@ -5646,8 +6989,8 @@
- 	SAVELDFLAGS="$LDFLAGS"
- 	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-       fi
+-    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
-+      { 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
-@@ -5660,56 +7003,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char getaddrinfo ();
+-int
+-main ()
+-{
 -getaddrinfo ();
-+return getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11064,97 +9357,117 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_inet6_getaddrinfo=no
-+	ac_cv_lib_inet6_getaddrinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
-@@ -5744,9 +7084,9 @@
- 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`
+-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 "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -5772,68 +7112,60 @@
- 
- #undef ${ipv6_cv_pfx}getaddrinfo
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_${ipv6_cv_pfx}getaddrinfo || defined __stub___${ipv6_cv_pfx}getaddrinfo
- choke me
+-choke me
 -#else
 -char (*f) () = ${ipv6_cv_pfx}getaddrinfo;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != ${ipv6_cv_pfx}getaddrinfo;
-+return ${ipv6_cv_pfx}getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11169,95 +9482,100 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- rm -f conftest*
-@@ -5852,8 +7184,8 @@
- fi
- if test $ipv6_cv_getaddrinfo = yes; then
- 
+-
+-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
-+{ 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
-@@ -5880,75 +7212,66 @@
- 
- #undef gai_strerror
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_gai_strerror || defined __stub___gai_strerror
- choke me
+-choke me
 -#else
 -char (*f) () = gai_strerror;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != gai_strerror;
-+return gai_strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11272,78 +9590,60 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_gai_strerror=no
-+	ac_cv_func_gai_strerror=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-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
-+    { 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
-@@ -5961,63 +7284,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char gai_strerror ();
+-int
+-main ()
+-{
 -gai_strerror ();
-+return gai_strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11358,101 +9658,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_socket_gai_strerror=no
-+	ac_cv_lib_socket_gai_strerror=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
+-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
-+      { 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
-@@ -6027,8 +7347,8 @@
- 	fi
-       done
- fi
+-    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
-+    { 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
-@@ -6037,8 +7357,8 @@
- 	SAVELDFLAGS="$LDFLAGS"
- 	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-       fi
+-    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
-+      { 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
-@@ -6051,56 +7371,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char gai_strerror ();
+-int
+-main ()
+-{
 -gai_strerror ();
-+return gai_strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11467,97 +9748,117 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_inet6_gai_strerror=no
-+	ac_cv_lib_inet6_gai_strerror=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
-@@ -6135,9 +7452,9 @@
- 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`
+-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 "$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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -6163,68 +7480,60 @@
- 
- #undef ${ipv6_cv_pfx}gai_strerror
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_${ipv6_cv_pfx}gai_strerror || defined __stub___${ipv6_cv_pfx}gai_strerror
- choke me
+-choke me
 -#else
 -char (*f) () = ${ipv6_cv_pfx}gai_strerror;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != ${ipv6_cv_pfx}gai_strerror;
-+return ${ipv6_cv_pfx}gai_strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11572,95 +9873,117 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- rm -f conftest*
-@@ -6260,8 +7569,8 @@
- 
- cyrus_cv_getnameinfo=yes
- 
+-
+-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
-+{ 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
-@@ -6288,75 +7597,66 @@
- 
- #undef getnameinfo
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_getnameinfo || defined __stub___getnameinfo
- choke me
+-choke me
 -#else
 -char (*f) () = getnameinfo;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != getnameinfo;
-+return getnameinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11675,78 +9998,60 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_getnameinfo=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_func_getnameinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_getnameinfo=no
-+	ac_cv_func_getnameinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-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
-+    { 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
-@@ -6369,63 +7669,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char getnameinfo ();
+-int
+-main ()
+-{
 -getnameinfo ();
-+return getnameinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11761,101 +10066,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_socket_getnameinfo=no
-+	ac_cv_lib_socket_getnameinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
+-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
-+      { 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
-@@ -6435,8 +7732,8 @@
- 	fi
-       done
- fi
+-    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
-+    { 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
-@@ -6445,8 +7742,8 @@
- 	SAVELDFLAGS="$LDFLAGS"
- 	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-       fi
+-    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
-+      { 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
-@@ -6459,56 +7756,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char getnameinfo ();
+-int
+-main ()
+-{
 -getnameinfo ();
-+return getnameinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11870,97 +10156,117 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_inet6_getnameinfo=no
-+	ac_cv_lib_inet6_getnameinfo=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
-@@ -6543,9 +7837,9 @@
- 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`
+-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 "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -6571,68 +7865,60 @@
- 
- #undef ${ipv6_cv_pfx}getnameinfo
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_${ipv6_cv_pfx}getnameinfo || defined __stub___${ipv6_cv_pfx}getnameinfo
- choke me
+-choke me
 -#else
 -char (*f) () = ${ipv6_cv_pfx}getnameinfo;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != ${ipv6_cv_pfx}getnameinfo;
-+return ${ipv6_cv_pfx}getnameinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11975,61 +10281,78 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- rm -f conftest*
-@@ -6664,8 +7950,8 @@
- fi
- 
- 
+-
+-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
-+{ 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
-@@ -6686,35 +7972,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12044,58 +10367,56 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ipv6_cv_ss_family=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ipv6_cv_ss_family=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ipv6_cv_ss_family=no
-+	ipv6_cv_ss_family=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ipv6_cv_ss_family = yes; then
- 
-@@ -6725,11 +8007,11 @@
- else
-   :
- fi
+-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: 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
-+{ 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
-@@ -6750,35 +8032,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12110,81 +10431,62 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ipv6_cv_sa_len=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ipv6_cv_sa_len=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ipv6_cv_sa_len=no
-+	ipv6_cv_sa_len=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ipv6_cv_sa_len = yes; then
- 
-@@ -6789,8 +8067,8 @@
- else
-   :
- fi
+-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
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
-+echo "${ECHO_T}$ipv6_cv_sa_len" >&6; }
- 
- 
- 
-@@ -6798,18 +8076,19 @@
- for ac_header in sys/time.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-
+-
+-
+-
+-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
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
+-  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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ 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
-@@ -6820,41 +8099,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12199,52 +10501,35 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core 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?
+-
+-# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ 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
-@@ -6863,24 +8138,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -12256,30 +10541,39 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6888,9 +8161,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -6914,25 +8188,19 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -12288,56 +10582,60 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-  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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6944,8 +8212,8 @@
- 
- done
- 
+-
+-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
-+{ 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
-@@ -6969,38 +8237,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12352,67 +10650,55 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_time=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_header_time=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_header_time=no
-+	ac_cv_header_time=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 -echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ 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
-@@ -7009,8 +8273,8 @@
- 
- fi
- 
+-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
-+{ 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
-@@ -7026,44 +8290,42 @@
- int
- main ()
- {
+-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;
-+struct tm tm;
-+				     int *p = &tm.tm_sec;
-+ 				     return !p;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12427,58 +10713,58 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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=time.h
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_struct_tm=sys/time.h
-+	ac_cv_struct_tm=sys/time.h
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
 -echo "${ECHO_T}$ac_cv_struct_tm" >&6
-+{ 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
-@@ -7072,8 +8334,8 @@
- 
- fi
- 
+-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
-+{ 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
-@@ -7098,33 +8360,28 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12493,38 +10779,39 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7145,40 +8402,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-/* 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12539,147 +10826,67 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_member_struct_tm_tm_zone=no
-+	ac_cv_member_struct_tm_tm_zone=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-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
-+{ 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
-@@ -7195,8 +8449,77 @@
- _ACEOF
- 
- else
+-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
-+  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-+echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_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>
-+
-+int
-+main ()
-+{
-+#ifndef tzname
-+  (void) tzname;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_have_decl_tzname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_have_decl_tzname=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
-+if test $ac_cv_have_decl_tzname = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_TZNAME 1
-+_ACEOF
-+
-+
-+else
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_TZNAME 0
-+_ACEOF
-+
-+
-+fi
-+
-+
-+  { 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
-@@ -7207,52 +8530,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <time.h>
+-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.  */
-+#if !HAVE_DECL_TZNAME
-+extern char *tzname[];
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -atoi(*tzname);
-+return tzname[0][0];
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12694,96 +10901,101 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_var_tzname=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_var_tzname=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_var_tzname=no
-+	ac_cv_var_tzname=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
-@@ -7272,9 +8592,9 @@
- for ac_func in vprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-  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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -7300,75 +8620,67 @@
- 
- #undef $ac_func
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12798,93 +11010,87 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
+-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
-+{ 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
-@@ -7395,68 +8707,59 @@
- 
- #undef _doprnt
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub__doprnt || defined __stub____doprnt
- choke me
+-choke me
 -#else
 -char (*f) () = _doprnt;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != _doprnt;
-+return _doprnt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -12899,132 +11105,128 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func__doprnt=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_func__doprnt=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func__doprnt=no
-+	ac_cv_func__doprnt=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
-@@ -7475,20 +8778,20 @@
- 
- 
- 
+-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.
-+# Check whether --with-bdb was given.
- if test "${with_bdb+set}" = set; then
+-if test "${with_bdb+set}" = set; then
 -  withval="$with_bdb"
 -  with_bdb=$withval
-+  withval=$with_bdb; with_bdb=$withval
- else
-   with_bdb="yes"
+-else
+-  with_bdb="yes"
 -fi;
-+fi
- 
- 
+-
+-
 -# Check whether --with-dbdir or --without-dbdir was given.
-+
-+# Check whether --with-dbdir was given.
- if test "${with_dbdir+set}" = set; then
+-if test "${with_dbdir+set}" = set; then
 -  withval="$with_dbdir"
 -  with_bdb=$withval
 -fi;
-+  withval=$with_dbdir; with_bdb=$withval
-+fi
-+
- 
- case "$with_bdb" in
-   no)
-@@ -7510,21 +8813,21 @@
- if test "$use_berkeley" != "no"; then
- 
- 
+-
+-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.
-+# Check whether --with-bdb-libdir was given.
- if test "${with_bdb_libdir+set}" = set; then
+-if test "${with_bdb_libdir+set}" = set; then
 -  withval="$with_bdb_libdir"
 -  with_bdb_lib=$withval
-+  withval=$with_bdb_libdir; with_bdb_lib=$withval
- else
-    test "${with_bdb_lib+set}" = set || with_bdb_lib=none
+-else
+-   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
 -fi;
-+fi
- 
+-
 -# Check whether --with-bdb-incdir or --without-bdb-incdir was given.
-+
-+# Check whether --with-bdb-incdir was given.
- if test "${with_bdb_incdir+set}" = set; then
+-if test "${with_bdb_incdir+set}" = set; then
 -  withval="$with_bdb_incdir"
 -  with_bdb_inc=$withval
-+  withval=$with_bdb_incdir; with_bdb_inc=$withval
- else
-    test "${with_bdb_inc+set}" = set || with_bdb_inc=none
+-else
+-   test "${with_bdb_inc+set}" = set || with_bdb_inc=none
 -fi;
-+fi
-+
- 
- 
- 
-@@ -7539,17 +8842,17 @@
- 	fi
- 
- 	                if test "${ac_cv_header_db_h+set}" = set; then
+-
+-
+-
+-
+-	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
-+  { 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
+-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
-+{ 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?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking db.h usability" >&5
 -echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
-+{ 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
-@@ -7560,41 +8863,37 @@
- #include <db.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13039,52 +11241,35 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core 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?
+-
+-# Is the header present?
 -echo "$as_me:$LINENO: checking db.h presence" >&5
 -echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
-+{ 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
-@@ -7603,24 +8902,22 @@
- /* end confdefs.h.  */
- #include <db.h>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -13096,30 +11281,39 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -7628,9 +8925,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -7654,25 +8952,18 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -13128,43 +11322,71 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for db.h" >&5
 -echo $ECHO_N "checking for db.h... $ECHO_C" >&6
-+{ 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
+-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
-+{ 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
-@@ -7720,35 +9011,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-
+-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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13179,43 +11401,42 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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
- 
+-  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"
-+	dblib="no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 	    if test "$dblib" = "berkeley"; then break; fi
-           done
-@@ -7770,35 +9058,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-      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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13230,132 +11451,172 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  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"
-+	dblib="no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-         fi
- 	LIBS=$saved_LIBS
-@@ -7854,13 +9139,13 @@
- 
- SIEVE_SUBDIRS=""
- sievedir="sieve"
+-      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.
-+# Check whether --enable-sieve was given.
- if test "${enable_sieve+set}" = set; then
+-if test "${enable_sieve+set}" = set; then
 -  enableval="$enable_sieve"
 -  if test "$enableval" = no; then
-+  enableval=$enable_sieve; if test "$enableval" = no; then
-  		sievedir="no"
- 	fi
+- 		sievedir="no"
+-	fi
 -fi;
-+fi
-+
- 
- if test "$sievedir" != "no"; then
- 	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-@@ -7879,8 +9164,8 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+-
+-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
-+{ 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
-@@ -7893,25 +9178,27 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
- 
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; 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
-+  { echo "$as_me:$LINENO: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$YACC" && break
- done
- test -n "$YACC" || YACC="yacc"
-@@ -7920,8 +9207,8 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+-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
-+{ 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
-@@ -7934,253 +9221,182 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
- 
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; 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
-+  { echo "$as_me:$LINENO: result: $LEX" >&5
-+echo "${ECHO_T}$LEX" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$LEX" && break
- done
- test -n "$LEX" || LEX=":"
- 
+-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
@@ -13375,33 +11636,18 @@
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
-+if test "x$LEX" != "x:"; then
-+  cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
- #endif
+-#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
+-int
 -main ()
-+main (void)
- {
+-{
 -yywrap ();
 -  ;
 -  return 0;
-+  return ! yylex () + ! yywrap ();
- }
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
@@ -13421,40 +11667,20 @@
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$LEX conftest.l") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_fl_yywrap=yes
-+  (exit $ac_status); }
-+{ 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
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -ac_cv_lib_fl_yywrap=no
-+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
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
- fi
+-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
@@ -13463,16 +11689,8 @@
 -  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 "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+  { echo "$as_me:$LINENO: checking lex library" >&5
-+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ll  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -13481,7 +11699,7 @@
 -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"
@@ -13496,28 +11714,15 @@
 -  ;
 -  return 0;
 -}
-+    ac_save_LIBS=$LIBS
-+    ac_cv_lib_lex='none needed'
-+    for ac_lib in '' -lfl -ll; do
-+      LIBS="$ac_lib $ac_save_LIBS"
-+      cat >conftest.$ac_ext <<_ACEOF
-+`cat $LEX_OUTPUT_ROOT.c`
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13533,16 +11738,10 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_l_yywrap=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_lex=$ac_lib
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-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 \
@@ -13554,16 +11753,11 @@
 -if test $ac_cv_lib_l_yywrap = yes; then
 -  LEXLIB="-ll"
 -fi
- 
- fi
- 
+-
 -fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+      test "$ac_cv_lib_lex" != 'none needed' && break
-+    done
-+    LIBS=$ac_save_LIBS
- 
+-
+-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
@@ -13589,52 +11783,36 @@
 -  { { 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
-+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
- fi
+-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
-+
-+{ 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
+-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
-+# 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
+-# 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
+-ac_save_LIBS=$LIBS
 -LIBS="$LIBS $LEXLIB"
-+LIBS="$LEXLIB $ac_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+#define YYTEXT_POINTER 1
- `cat $LEX_OUTPUT_ROOT.c`
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13649,73 +11827,61 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_prog_lex_yytext_pointer=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
+-  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 \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_save_LIBS
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_save_LIBS
 -rm -f "${LEX_OUTPUT_ROOT}.c"
- 
- fi
+-
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
 -echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
-+{ 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
-@@ -8188,11 +9404,12 @@
- _ACEOF
- 
- fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
- 
- fi
- 
+-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
-+{ 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
-@@ -8209,46 +9426,43 @@
- int
- main ()
- {
+-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 main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13730,94 +11896,66 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; 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=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_fl_main=no
-+	ac_cv_lib_fl_main=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-      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
-+{ 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
-@@ -8259,13 +9473,12 @@
- fi
- 
- 
+-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
-+ 	{ 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
+-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
-@@ -8273,115 +9486,73 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#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 ()
- {
+-char regcomp ();
+-int
+-main ()
+-{
 -regcomp ();
-+return regcomp ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  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
-+for ac_lib in '' rx regex; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13833,16 +11971,10 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_regcomp="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_regcomp=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-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
@@ -13855,7 +11987,7 @@
 -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"
@@ -13898,79 +12030,54 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
  
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_regcomp+set}" = set; then
-+  break
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
-+done
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+  :
-+else
-+  ac_cv_search_regcomp=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
+-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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
-+echo "${ECHO_T}$ac_cv_search_regcomp" >&6; }
-+ac_res=$ac_cv_search_regcomp
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
++	CPPFLAGS=$cmu_save_CPPFLAGS
  
- cat >>confdefs.h <<\_ACEOF
-@@ -8389,17 +9560,17 @@
- _ACEOF
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_REGEX
+-_ACEOF
  
- 		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
+-		 	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
-+  { 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
+-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
-+{ 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?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking rxposix.h usability" >&5
 -echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
-+{ 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
-@@ -8410,41 +9581,37 @@
- #include <rxposix.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -13985,87 +12092,88 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if test "$dblib" = "no"; then
++    as_fn_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." "$LINENO" 5
++  fi
  
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
++  if test "$with_bdb_lib" != "none"; then
  
- # Is the header present?
+-# Is the header present?
 -echo "$as_me:$LINENO: checking rxposix.h presence" >&5
 -echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
-+{ 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
-@@ -8453,24 +9620,22 @@
- /* end confdefs.h.  */
- #include <rxposix.h>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
+   else
 -    ac_cpp_err=
--  fi
++	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -8478,9 +9643,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -8504,25 +9670,18 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -14074,88 +12182,108 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for rxposix.h" >&5
 -echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
-+{ 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
+-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
-+{ 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
+-
  
- fi
- if test $ac_cv_header_rxposix_h = yes; then
-@@ -8544,8 +9703,8 @@
++  fi
  
- 
- 
 -echo "$as_me:$LINENO: checking for strerror" >&5
 -echo $ECHO_N "checking for strerror... $ECHO_C" >&6
-+{ 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
-@@ -8572,68 +9731,59 @@
+-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
++  BDB_INC=${BDB_INCADD}
++  BDB_LIB=${BDB_LIBADD}
  
- #undef 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
++  LIBS="${LIBS} ${BDB_LIBADD}"
++  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_strerror || defined __stub___strerror
- choke me
+-choke me
 -#else
 -char (*f) () = strerror;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
++  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return f != strerror;
-+return strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14170,77 +12298,76 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_strerror=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_cv_func_strerror=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define HAVE_BDB /**/" >>confdefs.h
  
 -ac_cv_func_strerror=no
-+	ac_cv_func_strerror=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      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
-+{ 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
+-if test $ac_cv_func_strerror = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -8653,18 +9803,19 @@
- for ac_header in sys/resource.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-cat >>confdefs.h <<\_ACEOF
+-#define HAS_STRERROR
+-_ACEOF
+ 
+-else
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define NEED_SYS_ERRLIST
+-_ACEOF
+ 
++SIEVE_SUBDIRS=""
++sievedir="sieve"
++# Check whether --enable-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"
+ 
+-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
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
+-  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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ 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
-@@ -8675,41 +9826,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14255,52 +12382,37 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	SIEVE_LIBS="../${sievedir}/libsieve.a"
  
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
++	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
  
- # Is the header present?
+-# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ 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
-@@ -8718,24 +9865,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -14308,34 +12420,71 @@
 -  else
 -    ac_cpp_err=
 -  fi
--else
++
++$as_echo "#define USE_SIEVE /**/" >>confdefs.h
++
++
++		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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_YACC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
+-  ac_header_preproc=yes
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # Let the user override the test.
  else
-   echo "$as_me: failed program was:" >&5
-@@ -8743,9 +9888,10 @@
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_YACC="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
-   ac_header_preproc=no
+-  ac_header_preproc=no
  fi
-+
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
-+{ 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
-@@ -8769,25 +9915,19 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -14344,92 +12493,157 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
+-  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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
+-
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
++$as_echo "$YACC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8803,9 +9943,9 @@
- for ac_func in setrlimit
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+ 
+-fi
+ 
++  test -n "$YACC" && break
+ done
++test -n "$YACC" || YACC="yacc"
+ 
+-
+-for ac_func in setrlimit
++	for ac_prog in flex lex
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_LEX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -8831,68 +9971,60 @@
+-  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
++  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_LEX="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
- #undef $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.  */
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
++$as_echo "$LEX" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
++if test "x$LEX" != "x:"; then
++  cat >conftest.l <<_ACEOF
++%%
++a { ECHO; }
++b { REJECT; }
++c { yymore (); }
++d { yyless (1); }
++e { yyless (input () != 0); }
++f { unput (yytext[0]); }
++. { BEGIN INITIAL; }
++%%
++#ifdef YYTEXT_POINTER
++extern char *yytext;
  #endif
- 
+-
  int
- main ()
+-main ()
++main (void)
  {
 -return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
+-  ;
+-  return 0;
++  return ! yylex () + ! yywrap ();
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14441,100 +12655,186 @@
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
++{ { ac_try="$LEX conftest.l"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$LEX conftest.l") 2>&5
+   ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
+-  eval "$as_ac_var=yes"
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
++$as_echo_n "checking lex output file root... " >&6; }
++if test "${ac_cv_prog_lex_root+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
++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
++  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8905,9 +10037,9 @@
- for ac_func in getrlimit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
++$as_echo "$ac_cv_prog_lex_root" >&6; }
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++if test -z "${LEXLIB+set}"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
++$as_echo_n "checking lex library... " >&6; }
++if test "${ac_cv_lib_lex+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    ac_save_LIBS=$LIBS
++    ac_cv_lib_lex='none needed'
++    for ac_lib in '' -lfl -ll; do
++      LIBS="$ac_lib $ac_save_LIBS"
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++`cat $LEX_OUTPUT_ROOT.c`
+ _ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_lex=$ac_lib
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++      test "$ac_cv_lib_lex" != 'none needed' && break
++    done
++    LIBS=$ac_save_LIBS
+ 
+ fi
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
++$as_echo "$ac_cv_lib_lex" >&6; }
++  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
++fi
+ 
+ 
+-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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
++$as_echo_n "checking whether yytext is a pointer... " >&6; }
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -8933,68 +10065,60 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  # 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
++ac_save_LIBS=$LIBS
++LIBS="$LEXLIB $ac_save_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
++#define YYTEXT_POINTER 1
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_prog_lex_yytext_pointer=yes
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
  
- #undef $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.  */
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
++$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+ 
+-#undef $ac_func
++fi
++rm -f conftest.l $LEX_OUTPUT_ROOT.c
++
++fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfl" >&5
++$as_echo_n "checking for main in -lfl... " >&6; }
++if test "${ac_cv_lib_fl_main+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
  
  int
  main ()
  {
 -return f != $ac_func;
-+return $ac_func ();
++return main ();
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14549,97 +12849,122 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_fl_main=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
++  ac_cv_lib_fl_main=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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_var'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_main" >&5
++$as_echo "$ac_cv_lib_fl_main" >&6; }
++if test "x$ac_cv_lib_fl_main" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9009,9 +10133,9 @@
- for ac_func in daemon setsid
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LIBFL 1
+ _ACEOF
+ 
+-fi
+-done
+-
++  LIBS="-lfl $LIBS"
+ 
++fi
+ 
+ 
+-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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
++$as_echo_n "checking for library containing regcomp... " >&6; }
++if test "${ac_cv_search_regcomp+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -9037,68 +10161,60 @@
- 
- #undef $ac_func
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
--#ifdef __cplusplus
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
 -}
++extern "C"
  #endif
- 
+-
++char regcomp ();
  int
  main ()
  {
 -return f != $ac_func;
-+return $ac_func ();
++return regcomp ();
    ;
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14654,97 +12979,161 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
+-  eval "$as_ac_var=yes"
++for ac_lib in '' rx regex; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_regcomp=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_regcomp+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_regcomp+set}" = set; then :
++
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_search_regcomp=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
++$as_echo "$ac_cv_search_regcomp" >&6; }
++ac_res=$ac_cv_search_regcomp
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++
++$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
++
++		 	ac_fn_c_check_header_mongrel "$LINENO" "rxposix.h" "ac_cv_header_rxposix_h" "$ac_includes_default"
++if test "x$ac_cv_header_rxposix_h" = x""yes; then :
++
++$as_echo "#define HAVE_RX /**/" >>confdefs.h
  
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
  fi
 -rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
 +
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9112,9 +10228,9 @@
- for ac_func in shutdown
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ 
++
++
++	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
+ 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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
++if test "x$ac_cv_func_strerror" = x""yes; then :
++
++$as_echo "#define HAS_STRERROR /**/" >>confdefs.h
++
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -9140,68 +10256,60 @@
+-  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
  
- #undef $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.  */
++$as_echo "#define NEED_SYS_ERRLIST /**/" >>confdefs.h
  
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+ 
+-#undef $ac_func
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
++for ac_header in sys/resource.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_resource_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_RESOURCE_H 1
++_ACEOF
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++fi
++
++done
++
++for ac_func in setrlimit
++do :
++  ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
++if test "x$ac_cv_func_setrlimit" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SETRLIMIT 1
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14759,95 +13148,190 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
  fi
 -rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++done
 +
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
++for ac_func in getrlimit
++do :
++  ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
++if test "x$ac_cv_func_getrlimit" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETRLIMIT 1
++_ACEOF
++
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++done
++
++
++for ac_func in daemon setsid
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9270,8 +10378,8 @@
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
+ fi
+ done
  
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++for ac_func in shutdown
++do :
++  ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
++if test "x$ac_cv_func_shutdown" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SHUTDOWN 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++fi
++done
++
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
++  $EGREP "socklen_t" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SOCKLEN_T
+-_ACEOF
++$as_echo "#define HAVE_SOCKLEN_T /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
++  $EGREP "sockaddr_storage" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_SOCKADDR_STORAGE
+-_ACEOF
++$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
++  $EGREP "rlim_t" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_RLIM_T
+-_ACEOF
++$as_echo "#define HAVE_RLIM_T /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+ 
  spt_type=""
 -echo "$as_me:$LINENO: checking for setproctitle" >&5
 -echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6
-+{ 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
-@@ -9298,75 +10406,66 @@
- 
- #undef setproctitle
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_setproctitle || defined __stub___setproctitle
- choke me
+-choke me
 -#else
 -char (*f) () = setproctitle;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != setproctitle;
-+return setproctitle ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14862,42 +13346,42 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_setproctitle=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_func_setproctitle=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_setproctitle=no
-+	ac_cv_func_setproctitle=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-if test $ac_cv_func_setproctitle = yes; then
++ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
++if test "x$ac_cv_func_setproctitle" = x""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
-+		{ 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
+-if test "${ac_cv_lib_util_setproctitle+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
++$as_echo_n "checking for setproctitle in -lutil... " >&6; }
++if test "${ac_cv_lib_util_setproctitle+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -9379,56 +10478,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -14919,21 +13403,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -14948,74 +13425,62 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_util_setproctitle=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_util_setproctitle=no
-+	ac_cv_lib_util_setproctitle=no
++  ac_cv_lib_util_setproctitle=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_util_setproctitle = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
++$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
++if test "x$ac_cv_lib_util_setproctitle" = x""yes; then :
    spt_type=SPT_BUILTIN
  			LIBS="${LIBS} -lutil"
-@@ -9437,17 +10533,17 @@
  fi
+ 
+ fi
  if test "$spt_type" = ""; then
- 	if test "${ac_cv_header_sys_pstat_h+set}" = set; 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
-+  { 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
+-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
-+{ 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?
+-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
-+{ 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
-@@ -9458,41 +10554,37 @@
- #include <sys/pstat.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15030,52 +13495,35 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core 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?
+-
+-# 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
-+{ 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
-@@ -9501,24 +10593,22 @@
- /* end confdefs.h.  */
- #include <sys/pstat.h>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -15087,30 +13535,39 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -9526,9 +10616,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -9552,25 +10643,18 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -15119,67 +13576,57 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
 -echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
-+{ 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
+-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
-+{ 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
++	ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_pstat_h" = x""yes; then :
+   spt_type=SPT_PSTAT
+ fi
  
+ 
  fi
- if test $ac_cv_header_sys_pstat_h = yes; then
-@@ -9581,17 +10665,17 @@
- fi
  if test "$spt_type" = ""; then
- 	if test "${ac_cv_header_sys_sysnews_h+set}" = set; 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
-+  { 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
+-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
-+{ 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?
+-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
-+{ 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
-@@ -9602,41 +10686,37 @@
- #include <sys/sysnews.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15194,52 +13641,35 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core 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?
+-
+-# 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
-+{ 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
-@@ -9645,24 +10725,22 @@
- /* end confdefs.h.  */
- #include <sys/sysnews.h>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -15251,30 +13681,39 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -9670,9 +10748,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -9696,25 +10775,18 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -15283,43 +13722,44 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
 -echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
-+{ 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
+-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
-+{ 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
++	ac_fn_c_check_header_mongrel "$LINENO" "sys/sysnews.h" "ac_cv_header_sys_sysnews_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysnews_h" = x""yes; then :
+   spt_type=SPT_SYSMIPS
  fi
- if test $ac_cv_header_sys_sysnews_h = yes; then
-@@ -9724,61 +10796,55 @@
  
+ 
  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 "$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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
++$as_echo_n "checking for PS_STRINGS... " >&6; }
++if test "${cyrus_cv_sys_psstrings+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
  #include <machine/vmparam.h>
  #include <sys/exec.h>
@@ -15331,19 +13771,11 @@
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -15355,20 +13787,15 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; 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
-+	cyrus_cv_sys_psstrings=no
+-  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
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -15380,35 +13807,38 @@
 +         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; }
++         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_psstrings" >&5
++$as_echo "$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
-+	{ 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
+-	if test "${cyrus_cv_sys_sco+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCO" >&5
++$as_echo_n "checking for SCO... " >&6; }
++	if test "${cyrus_cv_sys_sco+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -9793,24 +10859,22 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -15420,55 +13850,53 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
    cyrus_cv_sys_sco=yes
  else
-   echo "$as_me: failed program was:" >&5
-@@ -9818,18 +10882,19 @@
- 
+-  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
- 
+@@ -9824,49 +6704,25 @@ 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
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_sco" >&5
++$as_echo "$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
-+	{ 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
+-	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle usability" >&5
++$as_echo_n "checking for setproctitle usability... " >&6; }
++	if test "${cyrus_cv_sys_setproctitle+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -9844,24 +10909,22 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -15480,60 +13908,60 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
    cyrus_cv_sys_setproctitle=yes
  else
-   echo "$as_me: failed program was:" >&5
-@@ -9869,14 +10932,15 @@
- 
+-  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
- 
+@@ -9875,8 +6731,8 @@ 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
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_setproctitle" >&5
++$as_echo "$cyrus_cv_sys_setproctitle" >&6; }
  fi
  if test "$spt_type" != ""; then
  
-@@ -9886,8 +10950,8 @@
+@@ -9886,16 +6742,12 @@ _ACEOF
  
  fi
  
 -echo "$as_me:$LINENO: checking nonblocking method" >&5
 -echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6
-+{ 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
+-if test "${cyrus_cv_sys_nonblock+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nonblocking method" >&5
++$as_echo_n "checking nonblocking method... " >&6; }
++if test "${cyrus_cv_sys_nonblock+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -9912,45 +10976,42 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/file.h>
+@@ -9911,54 +6763,26 @@ fcntl(0, F_GETFL, 0)&FNDELAY
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15548,57 +13976,58 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    cyrus_cv_sys_nonblock=fcntl
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -cyrus_cv_sys_nonblock=ioctl
-+	cyrus_cv_sys_nonblock=ioctl
++  cyrus_cv_sys_nonblock=ioctl
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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: result: $WITH_NONBLOCK" >&5
-+echo "${ECHO_T}$WITH_NONBLOCK" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_NONBLOCK" >&5
++$as_echo "$WITH_NONBLOCK" >&6; }
  
 -echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
 -echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&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
+-if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking timezone GMT offset method" >&5
++$as_echo_n "checking timezone GMT offset method... " >&6; }
++if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -9973,43 +11034,39 @@
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <time.h>
+@@ -9972,55 +6796,27 @@ tm.tm_gmtoff = 0;
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15613,20 +14042,16 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
    cyrus_cv_struct_sys_gmtoff=tm
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -cyrus_cv_struct_sys_gmtoff=gmtime
-+	cyrus_cv_struct_sys_gmtoff=gmtime
++  cyrus_cv_struct_sys_gmtoff=gmtime
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -15636,181 +14061,214 @@
 -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
-+{ 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
+-if test "${cyrus_cv_func_mmap_shared+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_GMTOFF" >&5
++$as_echo "$WITH_GMTOFF" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared mmap" >&5
++$as_echo_n "checking for shared mmap... " >&6; }
++if test "${cyrus_cv_func_mmap_shared+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10049,13 +11106,22 @@
+-  if test "$cross_compiling" = yes; then
++  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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
+ #include <sys/types.h>
+@@ -10048,48 +6844,31 @@ if (strncmp(base+4, "test", 4) != 0) exi
+ exit(0);}
+ 
  _ACEOF
- rm -f conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10068,17 +11134,19 @@
- ( exit $ac_status )
- cyrus_cv_func_mmap_shared=no
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; 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
++  cyrus_cv_func_mmap_shared=no
  fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam 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
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_shared" >&5
++$as_echo "$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
-+{ 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
+-if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stupid shared mmap" >&5
++$as_echo_n "checking for stupid shared mmap... " >&6; }
++if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10119,13 +11187,22 @@
+-  if test "$cross_compiling" = yes; then
++  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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
+ #include <sys/types.h>
+@@ -10118,242 +6897,51 @@ if (strncmp(base, "xyzz", 4) != 0) exit(
+ exit(0);}
+ 
  _ACEOF
- rm -f conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10138,12 +11215,14 @@
- ( exit $ac_status )
- cyrus_cv_func_mmap_stupidshared=no
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; 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
++  cyrus_cv_func_mmap_stupidshared=no
  fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam 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
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_stupidshared" >&5
++$as_echo "$cyrus_cv_func_mmap_stupidshared" >&6; }
  if test $cyrus_cv_func_mmap_stupidshared = yes; then
  	WITH_MAP="stupidshared"
  else
-@@ -10157,14 +11236,13 @@
+-	{ 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;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This system does not have a working mmap()" >&5
++$as_echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Expect a considerable performance penalty" >&5
++$as_echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
+ 	WITH_MAP=nommap
+ fi
+ fi
  
  
  
 -# Check whether --with-lock or --without-lock was given.
-+# Check whether --with-lock was given.
- if test "${with_lock+set}" = set; then
+-if test "${with_lock+set}" = set; then
 -  withval="$with_lock"
 -  WITH_LOCK="$withval"
-+  withval=$with_lock; WITH_LOCK="$withval"
- else
- 
+-else
+-
 -  echo "$as_me:$LINENO: checking for fcntl" >&5
 -echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
-+  { 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
-@@ -10191,74 +11269,65 @@
- 
- #undef fcntl
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_fcntl || defined __stub___fcntl
- choke me
+-choke me
 -#else
 -char (*f) () = fcntl;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != fcntl;
-+return fcntl ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15825,91 +14283,94 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_fcntl=yes
+-  ac_cv_func_fcntl=yes
++# Check whether --with-lock was given.
++if test "${with_lock+set}" = set; then :
++  withval=$with_lock; WITH_LOCK="$withval"
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_fcntl=no
-+	ac_cv_func_fcntl=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-if test $ac_cv_func_fcntl = yes; then
++  ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
++if test "x$ac_cv_func_fcntl" = x""yes; then :
    WITH_LOCK="fcntl"
  else
  
 -		echo "$as_me:$LINENO: checking for flock" >&5
 -echo $ECHO_N "checking for flock... $ECHO_C" >&6
-+		{ 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
+-if test "${ac_cv_func_flock+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
++if test "x$ac_cv_func_flock" = x""yes; then :
++  WITH_LOCK="flock"
  else
-@@ -10285,68 +11354,59 @@
- 
- #undef flock
- 
+-  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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_flock || defined __stub___flock
- choke me
+-choke me
 -#else
 -char (*f) () = flock;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
+-#endif
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return f != flock;
-+return flock ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -15924,101 +14385,102 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_flock=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_cv_func_flock=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++				as_fn_error "unable to detect locking method" "$LINENO" 5
  
 -ac_cv_func_flock=no
-+	ac_cv_func_flock=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      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
-+{ 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
-@@ -10361,13 +11421,14 @@
+-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
  
+@@ -10361,180 +6949,57 @@ fi
+ fi
  
+ 
 -fi;
-+fi
-+
+-
  
  
- 
  LIB_RT=""
 -echo "$as_me:$LINENO: checking for fdatasync" >&5
 -echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
-+{ 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
-@@ -10394,68 +11455,59 @@
- 
- #undef fdatasync
- 
+-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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_fdatasync || defined __stub___fdatasync
- choke me
+-choke me
 -#else
 -char (*f) () = fdatasync;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != fdatasync;
-+return fdatasync ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16033,44 +14495,46 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_fdatasync=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_cv_func_fdatasync=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_func_fdatasync=no
-+	ac_cv_func_fdatasync=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-if test $ac_cv_func_fdatasync = yes; then
++ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
++if test "x$ac_cv_func_fdatasync" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
-@@ -10464,8 +11516,8 @@
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDATASYNC
+-_ACEOF
++$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
  
  else
  
 -  echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
 -echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
-+  { 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
+-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
++$as_echo_n "checking for fdatasync in -lrt... " >&6; }
++if test "${ac_cv_lib_rt_fdatasync+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10478,56 +11530,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16092,21 +14556,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16121,95 +14578,109 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_rt_fdatasync=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_rt_fdatasync=no
-+	ac_cv_lib_rt_fdatasync=no
++  ac_cv_lib_rt_fdatasync=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_rt_fdatasync = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
++$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
++if test "x$ac_cv_lib_rt_fdatasync" = x""yes; then :
  
  	LIB_RT="-lrt"
-@@ -10548,8 +11597,8 @@
-   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
-+  { 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
-@@ -10576,76 +11625,67 @@
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDATASYNC
+-_ACEOF
++$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
  
- #undef sigvec
  
+ fi
+@@ -10544,241 +7009,96 @@ 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.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
+-#ifdef __cplusplus
+-extern "C"
 -{
- #endif
+-#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.  */
+-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)
-+#if defined __stub_sigvec || defined __stub___sigvec
- choke me
+-choke me
 -#else
 -char (*f) () = sigvec;
 -#endif
 -#ifdef __cplusplus
 -}
- #endif
- 
- int
- main ()
- {
+-#endif
+-
+-int
+-main ()
+-{
 -return f != sigvec;
-+return sigvec ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16224,29 +14695,23 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_sigvec=yes
+-  ac_cv_func_sigvec=yes
++if test "${cyrus_sigveclib+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_sigvec=no
-+	ac_cv_func_sigvec=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
+-      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
-+{ 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
+-if test $ac_cv_func_sigvec = yes; then
++  ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec"
++if test "x$ac_cv_func_sigvec" = x""yes; then :
  
  	cyrus_sigveclib=""
  
@@ -16254,13 +14719,21 @@
  
 -    echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
 -echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6
-+    { 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
+-if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lBSD" >&5
++$as_echo_n "checking for sigvec in -lBSD... " >&6; }
++if test "${ac_cv_lib_BSD_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10658,64 +11698,61 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16282,21 +14755,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16311,30 +14777,27 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_BSD_sigvec=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_BSD_sigvec=no
-+	ac_cv_lib_BSD_sigvec=no
++  ac_cv_lib_BSD_sigvec=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_BSD_sigvec = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_BSD_sigvec" >&5
++$as_echo "$ac_cv_lib_BSD_sigvec" >&6; }
++if test "x$ac_cv_lib_BSD_sigvec" = x""yes; then :
    cyrus_sigveclib="-lBSD"
  else
  
@@ -16342,13 +14805,21 @@
          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
-+    { 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
+-if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lucb" >&5
++$as_echo_n "checking for sigvec in -lucb... " >&6; }
++if test "${ac_cv_lib_ucb_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10728,56 +11765,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16370,21 +14841,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16399,41 +14863,40 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ucb_sigvec=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_ucb_sigvec=no
-+	ac_cv_lib_ucb_sigvec=no
++  ac_cv_lib_ucb_sigvec=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_ucb_sigvec = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_sigvec" >&5
++$as_echo "$ac_cv_lib_ucb_sigvec" >&6; }
++if test "x$ac_cv_lib_ucb_sigvec" = x""yes; then :
  
              cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-@@ -10800,34 +11834,34 @@
+ else
+@@ -10800,34 +7120,32 @@ fi
  # all authentication goes through SASL
  
  
 -# Check whether --with-afs or --without-afs was given.
-+# Check whether --with-afs was given.
- if test "${with_afs+set}" = set; then
+-if test "${with_afs+set}" = set; then
 -  withval="$with_afs"
 -  with_afs="${withval}"
++# Check whether --with-afs was given.
++if test "${with_afs+set}" = set; then :
 +  withval=$with_afs; with_afs="${withval}"
  else
    with_afs="no"
@@ -16442,11 +14905,12 @@
  
  
 -# Check whether --with-ldap or --without-ldap was given.
-+
-+# Check whether --with-ldap was given.
- if test "${with_ldap+set}" = set; then
+-if test "${with_ldap+set}" = set; then
 -  withval="$with_ldap"
 -  with_ldap="${withval}"
++
++# Check whether --with-ldap was given.
++if test "${with_ldap+set}" = set; then :
 +  withval=$with_ldap; with_ldap="${withval}"
  else
    with_ldap="no"
@@ -16454,53 +14918,63 @@
 +fi
  
 -# Check whether --enable-krb5afspts or --disable-krb5afspts was given.
-+
-+# Check whether --enable-krb5afspts was given.
- if test "${enable_krb5afspts+set}" = set; then
+-if test "${enable_krb5afspts+set}" = set; then
 -  enableval="$enable_krb5afspts"
 -  SASL_GSSAPI_LIBS_SET="yes"
+ 
++# Check whether --enable-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
  
- cat >>confdefs.h <<\_ACEOF
- #define AFSPTS_USE_KRB5
- _ACEOF
- 
 -fi;
++$as_echo "#define AFSPTS_USE_KRB5 /**/" >>confdefs.h
++
 +fi
 +
  
  if test "x$with_afs" != "xno"; then
      if test ! -d $with_afs; then
-@@ -10856,8 +11890,8 @@
+@@ -10850,19 +7168,15 @@ if test "x$with_afs" != "xno"; then
+     AFS_LIBS="$AFS_LIBS -lc -lucb"
+     fi
  
+-    if test "${cyrus_afs_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if test "${cyrus_afs_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&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
-+        { 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
-@@ -10874,30 +11908,26 @@
+-                        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AFS libraries need sigvec" >&5
++$as_echo_n "checking if AFS libraries need sigvec... " >&6; }
++                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ IOMGR_Initialize();
+ int
+@@ -10873,60 +7187,34 @@ IOMGR_Initialize()
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16515,49 +14989,83 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
  
 -                                                echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+                                                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++                                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
                          cyrus_afs_sigvec="no"
  
  else
-@@ -10905,12 +11935,13 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+-  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
-+                                                { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++                                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
                          cyrus_afs_sigvec="yes"
  
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  
  fi
-@@ -10960,8 +11991,8 @@
+ 
+     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;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
++$as_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
++$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
+ 
+       fi
+     else
+@@ -10934,9 +7222,7 @@ _ACEOF
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_AFSKRB
+-_ACEOF
++$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
+ 
+     fi
+     LIBS="$SAVE_LIBS"
+@@ -10960,75 +7246,45 @@ if test "x$with_ldap" != "xno"; then
      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
-+    { 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
+-if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
++$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
++if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -10974,56 +12005,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16579,21 +15087,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16608,41 +15109,53 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ldap_ldap_initialize=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_ldap_ldap_initialize=no
-+	ac_cv_lib_ldap_ldap_initialize=no
++  ac_cv_lib_ldap_ldap_initialize=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_ldap_ldap_initialize = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
++$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
++if test "x$ac_cv_lib_ldap_ldap_initialize" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
-@@ -11052,46 +12080,46 @@
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LDAP
+-_ACEOF
++$as_echo "#define HAVE_LDAP /**/" >>confdefs.h
+ 
+ 
+ 
+@@ -11045,116 +7301,85 @@ if test "x$with_afs" != "xno" -o "x$with
+ 	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
+ 	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_PTS
+-_ACEOF
++$as_echo "#define WITH_PTS /**/" >>confdefs.h
+ 
  fi
  
  SERVER_SUBDIRS="master imap"
 -# Check whether --enable-server or --disable-server was given.
-+# Check whether --enable-server was given.
- if test "${enable_server+set}" = set; then
+-if test "${enable_server+set}" = set; then
 -  enableval="$enable_server"
 -  if test "$enableval" = no; then
++# Check whether --enable-server was given.
++if test "${enable_server+set}" = set; then :
 +  enableval=$enable_server; if test "$enableval" = no; then
          	SERVER_SUBDIRS=""
  	fi
@@ -16654,35 +15167,38 @@
  
  
 -# Check whether --with-krb or --without-krb was given.
-+# Check whether --with-krb was given.
- if test "${with_krb+set}" = set; then
+-if test "${with_krb+set}" = set; then
 -  withval="$with_krb"
 -  with_krb="$withval"
++# Check whether --with-krb was given.
++if test "${with_krb+set}" = set; then :
 +  withval=$with_krb; with_krb="$withval"
  else
    with_krb="no"
 -fi;
 +fi
++
  
  
 -# Check whether --with-krbimpl or --without-krbimpl was given.
-+
-+# Check whether --with-krbimpl was given.
- if test "${with_krbimpl+set}" = set; then
+-if test "${with_krbimpl+set}" = set; then
 -  withval="$with_krbimpl"
 -  with_krbimpl="$withval"
++# Check whether --with-krbimpl was given.
++if test "${with_krbimpl+set}" = set; then :
 +  withval=$with_krbimpl; with_krbimpl="$withval"
  else
    with_krbimpl="kth"
 -fi;
 +fi
++
  
 -# Check whether --enable-statickrb or --disable-statickrb was given.
-+
-+# Check whether --enable-statickrb was given.
- if test "${enable_statickrb+set}" = set; then
+-if test "${enable_statickrb+set}" = set; then
 -  enableval="$enable_statickrb"
 -  with_statickrb="yes"
++# Check whether --enable-statickrb was given.
++if test "${enable_statickrb+set}" = set; then :
 +  enableval=$enable_statickrb; with_statickrb="yes"
  else
    with_statickrb="no"
@@ -16693,14 +15209,21 @@
  
 -echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
 -echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&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
+-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
++$as_echo_n "checking for res_search in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -11104,56 +12132,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16722,21 +15245,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16751,41 +15267,48 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_resolv_res_search=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_resolv_res_search=no
-+	ac_cv_lib_resolv_res_search=no
++  ac_cv_lib_resolv_res_search=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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
+-if test $ac_cv_lib_resolv_res_search = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
++$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
++if test "x$ac_cv_lib_resolv_res_search" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBRESOLV 1
-@@ -11172,16 +12197,16 @@
+ _ACEOF
+@@ -11165,105 +7390,73 @@ 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; }; }
++      as_fn_error "--enable-statickrb specified but --with-krb did not specify a valid directory" "$LINENO" 5
+ fi
+ 
  if test "$with_krb" != "no"; then
  
 -# Check whether --with-krbdes or --without-krbdes was given.
-+# Check whether --with-krbdes was given.
- if test "${with_krbdes+set}" = set; then
+-if test "${with_krbdes+set}" = set; then
 -  withval="$with_krbdes"
 -  with_krbdes="$withval"
++# Check whether --with-krbdes was given.
++if test "${with_krbdes+set}" = set; then :
 +  withval=$with_krbdes; with_krbdes="$withval"
  else
    with_krbdes="yes"
@@ -16795,13 +15318,21 @@
  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
-+  { 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
+-if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_ecb_encrypt in -ldes" >&5
++$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
++if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -11194,56 +12219,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
+   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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -16823,21 +15354,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16852,96 +15376,98 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_des_des_ecb_encrypt=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_des_des_ecb_encrypt=no
-+	ac_cv_lib_des_des_ecb_encrypt=no
++  ac_cv_lib_des_des_ecb_encrypt=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+{ 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 $ac_cv_lib_des_des_ecb_encrypt = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
++$as_echo "$ac_cv_lib_des_des_ecb_encrypt" >&6; }
++if test "x$ac_cv_lib_des_des_ecb_encrypt" = x""yes; then :
    if test "$with_statickrb" = "yes"; then
            KRB_LIBS="$with_krb/lib/libdes.a"
-@@ -11260,8 +12282,8 @@
+       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; }; }
++  as_fn_error "The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." "$LINENO" 5
  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
-+   { 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
+-if test "${cyrus_krbinclude+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos includes" >&5
++$as_echo_n "checking for Kerberos includes... " >&6; }
++if test "${cyrus_krbinclude+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
-@@ -11275,8 +12297,8 @@
+ 
+      for krbhloc in include/kerberosIV include
+@@ -11275,8 +7468,8 @@ else
       done
  
  fi
 -echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
 -echo "${ECHO_T}$cyrus_krbinclude" >&6
-+{ echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
-+echo "${ECHO_T}$cyrus_krbinclude" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_krbinclude" >&5
++$as_echo "$cyrus_krbinclude" >&6; }
  
     if test -n "${cyrus_krbinclude}"; then
       CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -11299,17 +12321,17 @@
+@@ -11298,237 +7491,73 @@ else
+ fi
  
  if test "$with_des" != no; then
-   if test "${ac_cv_header_krb_h+set}" = set; 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
-+  { 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
+-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
-+{ 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?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking krb.h usability" >&5
 -echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
-+{ 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
-@@ -11320,41 +12342,37 @@
- #include <krb.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -16956,52 +15482,35 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_header_compiler=no
-+	ac_header_compiler=no
- fi
+-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
-+
-+rm -f core 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?
+-
+-# Is the header present?
 -echo "$as_me:$LINENO: checking krb.h presence" >&5
 -echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
-+{ 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
-@@ -11363,24 +12381,22 @@
- /* end confdefs.h.  */
- #include <krb.h>
- _ACEOF
+-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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  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
@@ -17013,30 +15522,39 @@
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -11388,9 +12404,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  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
-+{ 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
-@@ -11414,32 +12431,25 @@
- 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;}
+-
+-# 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
 -## ------------------------------------------ ##
@@ -17045,37 +15563,41 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for krb.h" >&5
 -echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
-+{ 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
+-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
-+{ 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`
+-
+-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 "$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 { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
++if test "x$ac_cv_header_krb_h" = x""yes; then :
++  as_ac_Lib=`$as_echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_mk_priv in -l${KRBLIB}" >&5
++$as_echo_n "checking for krb_mk_priv in -l${KRBLIB}... " >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11451,56 +12461,54 @@
- cat >>conftest.$ac_ext <<_ACEOF
+ 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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -17097,21 +15619,14 @@
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -17126,62 +15641,104 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
    eval "$as_ac_Lib=yes"
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -eval "$as_ac_Lib=no"
-+	eval "$as_ac_Lib=no"
++  eval "$as_ac_Lib=no"
  fi
 -rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Lib
++   if test "x$as_val" = x""yes; then :
    if test "$with_statickrb" = "yes"; then
            KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-@@ -11539,11 +12547,11 @@
+       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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
++$as_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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
++$as_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;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No DES library found for Kerberos V4 support" >&5
++$as_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
++$as_echo "#define HAVE_KRB /**/" >>confdefs.h
+ 
+ fi
+ 
+@@ -11539,11 +7568,11 @@ SASL_GSSAPI_LIBS_SET="yes"
+ 
  IMAP_PROGS=""
  
 -# Check whether --with-openssl or --without-openssl was given.
-+# Check whether --with-openssl was given.
- if test "${with_openssl+set}" = set; then
+-if test "${with_openssl+set}" = set; then
 -  withval="$with_openssl"
 -  with_openssl="${withval}"
 -fi;
++# Check whether --with-openssl was given.
++if test "${with_openssl+set}" = set; then :
 +  withval=$with_openssl; with_openssl="${withval}"
 +fi
 +
  
  OPENSSL_INC=
  OPENSSL_LIB=
-@@ -11551,8 +12559,8 @@
+@@ -11551,71 +7580,43 @@ 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
-+	        { 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