Ubuntu cyrus-imapd-2.2 2.2.13-10ubuntu2
Ubuntu Merge-o-Matic
mom at ubuntu.com
Fri Feb 23 11:22:27 CET 2007
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Fri, 23 Feb 2007 19:36:54 +1100
Source: cyrus-imapd-2.2
Binary: cyrus-dev-2.2 libcyrus-imap-perl22 cyrus-common-2.2 cyrus-doc-2.2 cyrus-clients-2.2 cyrus-pop3d-2.2 cyrus-imapd-2.2 cyrus-admin-2.2 cyrus-nntpd-2.2 cyrus-murder-2.2
Architecture: source
Version: 2.2.13-10ubuntu2
Distribution: feisty
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Steve Kowalik <stevenk at ubuntu.com>
Description:
cyrus-admin-2.2 - Cyrus mail system (administration tools)
cyrus-clients-2.2 - Cyrus mail system (test clients)
cyrus-common-2.2 - Cyrus mail system (common files)
cyrus-dev-2.2 - Cyrus mail system (developer files)
cyrus-doc-2.2 - Cyrus mail system (documentation files)
cyrus-imapd-2.2 - Cyrus mail system (IMAP support)
cyrus-murder-2.2 - Cyrus mail system (proxies and aggregator)
cyrus-nntpd-2.2 - Cyrus mail system (NNTP support)
cyrus-pop3d-2.2 - Cyrus mail system (POP3 support)
libcyrus-imap-perl22 - Interface to Cyrus imap client imclient library
Changes:
cyrus-imapd-2.2 (2.2.13-10ubuntu2) feisty; urgency=low
.
* Add missing semi-colon and correct a const in 61-64bit-quota.
* Add a patch to drop libdb4.4 detection, as it will always use that
if it's available. (LP: #67111)
* Update configure patching in 99-update-autoconf.
* Correct Maintainer fields.
Files:
55c465ce23d3ff519052a658160b6e8e 1355 mail extra cyrus-imapd-2.2_2.2.13-10ubuntu2.dsc
0033e6045a1bfd501103987533ab0c8f 237146 mail extra cyrus-imapd-2.2_2.2.13-10ubuntu2.diff.gz
Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 2.2.13-10ubuntu1/debian/changelog 2.2.13-10ubuntu2/debian/changelog
--- 2.2.13-10ubuntu1/debian/changelog 2007-02-23 10:12:40.000000000 +0000
+++ 2.2.13-10ubuntu2/debian/changelog 2007-02-23 10:12:39.000000000 +0000
@@ -1,3 +1,13 @@
+cyrus-imapd-2.2 (2.2.13-10ubuntu2) feisty; urgency=low
+
+ * Add missing semi-colon and correct a const in 61-64bit-quota.
+ * Add a patch to drop libdb4.4 detection, as it will always use that
+ if it's available. (LP: #67111)
+ * Update configure patching in 99-update-autoconf.
+ * Correct Maintainer fields.
+
+ -- Steve Kowalik <stevenk at ubuntu.com> Fri, 23 Feb 2007 19:36:54 +1100
+
cyrus-imapd-2.2 (2.2.13-10ubuntu1) feisty; urgency=low
* Merge from debian unstable, remaining changes:
diff -pruN 2.2.13-10ubuntu1/debian/control 2.2.13-10ubuntu2/debian/control
--- 2.2.13-10ubuntu1/debian/control 2007-02-23 10:12:40.000000000 +0000
+++ 2.2.13-10ubuntu2/debian/control 2007-02-23 10:12:39.000000000 +0000
@@ -2,7 +2,7 @@ Source: cyrus-imapd-2.2
Section: mail
Priority: extra
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
-Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
+XSBC-Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, Ondřej Surý <ondrej at debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.3-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
diff -pruN 2.2.13-10ubuntu1/debian/patches/00list 2.2.13-10ubuntu2/debian/patches/00list
--- 2.2.13-10ubuntu1/debian/patches/00list 2007-02-23 10:12:40.000000000 +0000
+++ 2.2.13-10ubuntu2/debian/patches/00list 2007-02-23 10:12:39.000000000 +0000
@@ -54,5 +54,6 @@
72-faster-isdigit.dpatch
75-update-imapd.conf-documentation.dpatch
77-change-missing-sieve-notice.dpatch
+80-berkelydb-version.dpatch
80-kbsd-no-psstrings.dpatch
99-update-autoconf.dpatch
diff -pruN 2.2.13-10ubuntu1/debian/patches/61-64bit-quota.dpatch 2.2.13-10ubuntu2/debian/patches/61-64bit-quota.dpatch
--- 2.2.13-10ubuntu1/debian/patches/61-64bit-quota.dpatch 2007-02-23 10:12:40.000000000 +0000
+++ 2.2.13-10ubuntu2/debian/patches/61-64bit-quota.dpatch 2007-02-23 10:12:39.000000000 +0000
@@ -117,7 +117,7 @@ diff -urNad cyrus-imapd-2.2/imap/mailbox
+ htonll(mailbox->quota_mailbox_used);
+#else
+ /* zero the unused 32bits */
-+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0)
++ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
*((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
htonl(mailbox->quota_mailbox_used);
+#endif
@@ -429,7 +429,7 @@ diff -urNad cyrus-imapd-2.2/imap/reconst
+#ifdef HAVE_LONG_LONG_INT
+ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(new_quota);
+#else
-+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED32)) = htonl(new_quota);
++ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
+#endif
+
*((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
diff -pruN 2.2.13-10ubuntu1/debian/patches/80-berkelydb-version.dpatch 2.2.13-10ubuntu2/debian/patches/80-berkelydb-version.dpatch
--- 2.2.13-10ubuntu1/debian/patches/80-berkelydb-version.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ 2.2.13-10ubuntu2/debian/patches/80-berkelydb-version.dpatch 2007-02-23 10:12:39.000000000 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 98-berkelydb-version.dpatch by Steve Kowalik <stevenk at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Drop libdb4.4 detection, as it is included in minimal, and will
+## DP: stupidly pick it when we want 4.3.
+
+ at DPATCH@
+--- cyrus-imapd-2.2-2.2.13~/cmulocal/berkdb.m4 2005-04-27 05:14:07.000000000 +1000
++++ cyrus-imapd-2.2-2.2.13/cmulocal/berkdb.m4 2007-02-23 00:49:59.000000000 +1100
+@@ -213,7 +213,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+diff -urNad cyrus-imapd-2.2-2.2.13~/configure cyrus-imapd-2.2-2.2.13/configure
diff -pruN 2.2.13-10ubuntu1/debian/patches/99-update-autoconf.dpatch 2.2.13-10ubuntu2/debian/patches/99-update-autoconf.dpatch
--- 2.2.13-10ubuntu1/debian/patches/99-update-autoconf.dpatch 2007-02-23 10:12:40.000000000 +0000
+++ 2.2.13-10ubuntu2/debian/patches/99-update-autoconf.dpatch 2007-02-23 10:12:39.000000000 +0000
@@ -6,462 +6,10 @@
## DP: (64bit-quota and potentially DRAC)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13~/config.guess cyrus-imapd-2.2.13/config.guess
---- cyrus-imapd-2.2.13~/config.guess 2006-10-10 15:28:04.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.guess 2006-10-10 15:29:07.000000000 +0000
-@@ -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 @@
+diff -urNad cyrus-imapd-2.2-2.2.13~/config.guess cyrus-imapd-2.2-2.2.13/config.guess
+--- cyrus-imapd-2.2-2.2.13~/config.guess 2000-04-25 14:42:12.000000000 +1000
++++ cyrus-imapd-2.2-2.2.13/config.guess 2007-02-23 18:59:43.000000000 +1100
+@@ -202,12 +202,12 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -477,7 +25,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
-@@ -217,19 +361,13 @@
+@@ -217,19 +217,13 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
@@ -500,7 +48,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
# > 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 @@
+@@ -237,61 +231,45 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
@@ -578,7 +126,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
-@@ -310,28 +432,37 @@
+@@ -310,28 +288,37 @@
exit (-1);
}
EOF
@@ -626,7 +174,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
[ ${TARGET_BINARY_INTERFACE}x = x ]
-@@ -343,31 +474,40 @@
+@@ -343,31 +330,40 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -677,7 +225,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
-@@ -379,18 +519,21 @@
+@@ -379,18 +375,21 @@
exit(0);
}
EOF
@@ -696,1250 +244,20 @@ diff -urNad cyrus-imapd-2.2.13~/config.g
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 ;;
+- *: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 ;;
- 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 cyrus-imapd-2.2.13/config.h.in
---- cyrus-imapd-2.2.13~/config.h.in 2006-10-10 15:28:04.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.h.in 2006-10-10 15:28:50.000000000 +0000
-@@ -85,6 +85,10 @@
- /* Define to 1 if you have the `daemon' function. */
- #undef HAVE_DAEMON
-
-+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-+ */
-+#undef HAVE_DECL_TZNAME
-+
- /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
- #undef HAVE_DIRENT_H
-@@ -153,8 +157,8 @@
- /* Do we have TCP wrappers? */
- #undef HAVE_LIBWRAP
-
--/* Define to 1 if you support file names longer than 14 characters. */
--#undef HAVE_LONG_FILE_NAMES
-+/* Does the compiler support long long int? */
-+#undef HAVE_LONG_LONG_INT
-
- /* Define to 1 if you have the `memmove' function. */
- #undef HAVE_MEMMOVE
-@@ -310,9 +314,15 @@
- /* Directiory to use for service binaries */
- #undef SERVICE_PATH
-
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
-
-+/* The size of `long long int', as computed by sizeof. */
-+#undef SIZEOF_LONG_LONG_INT
-+
-+/* The size of `unsigned long long int', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED_LONG_LONG_INT
-+
- /* Do we already have setproctitle? */
- #undef SPT_TYPE
-
-@@ -337,6 +347,10 @@
++ *: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
+diff -urNad cyrus-imapd-2.2-2.2.13~/config.h.in cyrus-imapd-2.2-2.2.13/config.h.in
+--- cyrus-imapd-2.2-2.2.13~/config.h.in 2006-04-01 02:25:49.000000000 +1100
++++ cyrus-imapd-2.2-2.2.13/config.h.in 2007-02-23 18:59:43.000000000 +1100
+@@ -337,6 +337,10 @@
/* Build in PTS support? */
#undef WITH_PTS
@@ -1950,7 +268,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.h
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#undef YYTEXT_POINTER
-@@ -496,7 +510,11 @@
+@@ -496,7 +500,11 @@
SQUAT_ENGINE = 1,
/* should we have long LMTP error messages? */
@@ -1963,139 +281,10 @@ diff -urNad cyrus-imapd-2.2.13~/config.h
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.2.13~/config.sub cyrus-imapd-2.2.13/config.sub
---- cyrus-imapd-2.2.13~/config.sub 2006-10-10 15:28:04.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.sub 2006-10-10 15:29:07.000000000 +0000
-@@ -1,6 +1,11 @@
- #! /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-07-02'
-+
- # 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 @@
+diff -urNad cyrus-imapd-2.2-2.2.13~/config.sub cyrus-imapd-2.2-2.2.13/config.sub
+--- cyrus-imapd-2.2-2.2.13~/config.sub 2000-04-25 14:42:12.000000000 +1000
++++ cyrus-imapd-2.2-2.2.13/config.sub 2007-02-23 18:59:43.000000000 +1100
+@@ -94,7 +94,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -2104,7 +293,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
os=
basic_machine=$1
;;
-@@ -108,9 +162,21 @@
+@@ -108,9 +108,21 @@
os=-vxworks
basic_machine=$1
;;
@@ -2126,7 +315,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -127,6 +193,10 @@
+@@ -127,6 +139,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -2137,7 +326,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -166,27 +236,73 @@
+@@ -166,27 +182,73 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
@@ -2225,7 +414,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
-@@ -195,24 +311,66 @@
+@@ -195,24 +257,66 @@
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -2310,7 +499,7 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -230,6 +388,9 @@
+@@ -230,6 +334,9 @@
basic_machine=a29k-amd
os=-udi
;;
@@ -2320,775 +509,14 @@ diff -urNad cyrus-imapd-2.2.13~/config.s
adobe68k)
basic_machine=m68010-adobe
os=-scout
-@@ -244,19 +405,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 +442,10 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -295,27 +466,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 +513,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -357,6 +550,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 +629,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 +653,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 +678,10 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -499,14 +689,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 +699,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 +771,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 +814,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 +893,26 @@
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
- sequent)
- basic_machine=i386-sequent
- ;;
-@@ -671,7 +920,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 +981,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 +1047,8 @@
- os=-vms
- ;;
- vpp*|vx|vx-*)
-- basic_machine=f301-fujitsu
-- ;;
-+ basic_machine=f301-fujitsu
-+ ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
-@@ -789,13 +1069,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 +1100,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 +1143,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 +1198,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 +1253,12 @@
- -opened*)
- os=-openedition
- ;;
-+ -os400*)
-+ os=-os400
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
- -osfrose*)
- os=-osfrose
- ;;
-@@ -955,14 +1274,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 +1302,15 @@
- -sinix*)
- os=-sysv4
- ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
-- -qnx)
-- os=-qnx4
-- ;;
- -svr4)
- os=-sysv4
- ;;
-@@ -1001,8 +1332,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 +1366,9 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1035,7 +1378,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 +1412,9 @@
- mips*-*)
- os=-elf
- ;;
-+ or32-*)
-+ os=-coff
-+ ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
-@@ -1071,9 +1424,15 @@
- *-be)
- os=-beos
- ;;
-+ *-haiku)
-+ os=-haiku
-+ ;;
- *-ibm)
- os=-aix
- ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
- *-wec)
- os=-proelf
- ;;
-@@ -1125,25 +1484,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 +1565,16 @@
- -mvs* | -opened*)
- vendor=ibm
- ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
- -ptx*)
- vendor=sequent
- ;;
-- -vxsim* | -vxworks*)
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
-@@ -1221,12 +1586,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 cyrus-imapd-2.2.13/configure
---- cyrus-imapd-2.2.13~/configure 2006-10-10 15:28:04.000000000 +0000
-+++ cyrus-imapd-2.2.13/configure 2006-10-10 15:29:07.000000000 +0000
+diff -urNad cyrus-imapd-2.2-2.2.13~/configure cyrus-imapd-2.2-2.2.13/configure
+--- cyrus-imapd-2.2-2.2.13~/configure 2006-04-01 02:25:50.000000000 +1100
++++ cyrus-imapd-2.2-2.2.13/configure 2007-02-23 19:07:14.000000000 +1100
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60a.
++# Generated by GNU Autoconf 2.60.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -3752,53 +1180,19 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -275,42 +565,179 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
+@@ -300,17 +590,154 @@
#endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
+ #if HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
+#endif
-+#ifdef HAVE_UNISTD_H
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -3886,8 +1280,8 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+YACC
+YFLAGS
+LEX
-+LEX_OUTPUT_ROOT
+LEXLIB
++LEX_OUTPUT_ROOT
+SIEVE_SUBDIRS
+WITH_NONBLOCK
+WITH_GMTOFF
@@ -4502,7 +1896,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60a
++generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4521,7 +1915,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -4940,7 +2334,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
+
+WARNERROR=-W
@@ -4949,7 +2343,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ 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
@@ -5485,7 +2879,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -1903,47 +2414,77 @@
+@@ -1903,46 +2414,70 @@
# 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.
@@ -5539,7 +2933,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files ''
++for ac_file in $ac_files
do
test -f "$ac_file" || continue
case $ac_file in
@@ -5576,21 +2970,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
-+ 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
sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -1955,19 +2496,21 @@
+@@ -1955,19 +2490,23 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
++{ 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
@@ -5614,7 +3003,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -1986,22 +2529,27 @@
+@@ -1986,22 +2525,27 @@
fi
fi
fi
@@ -5653,7 +3042,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2012,9 +2560,8 @@
+@@ -2012,9 +2556,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -5664,7 +3053,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
break;;
* ) break;;
esac
-@@ -2028,14 +2575,14 @@
+@@ -2028,14 +2571,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -5683,7 +3072,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2055,14 +2602,20 @@
+@@ -2055,14 +2598,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5708,7 +3097,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2080,12 +2633,12 @@
+@@ -2080,12 +2629,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -5725,7 +3114,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2108,24 +2661,36 @@
+@@ -2108,24 +2657,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5770,7 +3159,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2134,24 +2699,28 @@
+@@ -2134,24 +2695,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5807,7 +3196,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -2167,24 +2736,36 @@
+@@ -2167,24 +2732,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5852,7 +3241,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2193,12 +2774,131 @@
+@@ -2193,12 +2770,131 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5988,7 +3377,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -2214,12 +2914,12 @@
+@@ -2214,12 +2910,12 @@
CFLAGS=
fi
fi
@@ -6005,7 +3394,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2253,12 +2953,17 @@
+@@ -2253,12 +2949,17 @@
/* 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
@@ -6025,7 +3414,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2273,205 +2978,74 @@
+@@ -2273,205 +2974,74 @@
return 0;
}
_ACEOF
@@ -6270,7 +3659,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2481,8 +3055,8 @@
+@@ -2481,8 +3051,8 @@
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
@@ -6281,7 +3670,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2495,32 +3069,34 @@
+@@ -2495,32 +3065,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6323,7 +3712,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2533,57 +3109,72 @@
+@@ -2533,57 +3105,72 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6419,7 +3808,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2600,8 +3191,8 @@
+@@ -2600,8 +3187,8 @@
# 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.
@@ -6430,7 +3819,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2623,7 +3214,7 @@
+@@ -2623,7 +3210,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6439,7 +3828,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
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 +3233,22 @@
+@@ -2642,21 +3229,22 @@
;;
esac
done
@@ -6467,7 +3856,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2672,8 +3264,8 @@
+@@ -2672,8 +3260,8 @@
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
@@ -6478,7 +3867,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -2707,8 +3299,13 @@
+@@ -2707,8 +3295,13 @@
#endif
Syntax error
_ACEOF
@@ -6494,7 +3883,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -2733,9 +3330,10 @@
+@@ -2733,9 +3326,10 @@
# Broken: fails on valid input.
continue
fi
@@ -6506,7 +3895,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2745,8 +3343,13 @@
+@@ -2745,8 +3339,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6522,7 +3911,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -2773,6 +3376,7 @@
+@@ -2773,6 +3372,7 @@
ac_preproc_ok=:
break
fi
@@ -6530,7 +3919,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
rm -f conftest.err conftest.$ac_ext
done
-@@ -2790,8 +3394,8 @@
+@@ -2790,8 +3390,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -6541,7 +3930,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -2814,8 +3418,13 @@
+@@ -2814,8 +3414,13 @@
#endif
Syntax error
_ACEOF
@@ -6557,7 +3946,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -2840,9 +3449,10 @@
+@@ -2840,9 +3445,10 @@
# Broken: fails on valid input.
continue
fi
@@ -6569,7 +3958,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2852,8 +3462,13 @@
+@@ -2852,8 +3458,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6585,7 +3974,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -2880,6 +3495,7 @@
+@@ -2880,6 +3491,7 @@
ac_preproc_ok=:
break
fi
@@ -6593,7 +3982,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
rm -f conftest.err conftest.$ac_ext
done
-@@ -2902,24 +3518,171 @@
+@@ -2902,24 +3514,171 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6646,7 +4035,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ # 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
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -6662,11 +4051,8 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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
-
++fi
++
+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
@@ -6677,10 +4063,8 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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; }
@@ -6733,7 +4117,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
-+ fi
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -6749,19 +4133,24 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+IFS=$as_save_IFS
+
+
-+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
+
+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
+ ac_cv_path_EGREP=$EGREP
+fi
-+
+
+-echo "$as_me:$LINENO: checking for AIX" >&5
+-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+
+ fi
+fi
@@ -6776,7 +4165,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -2933,26 +3696,25 @@
+@@ -2933,26 +3692,25 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then
@@ -6809,7 +4198,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -2960,115 +3722,89 @@
+@@ -2960,115 +3718,89 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -6945,7 +4334,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+ break
@@ -6974,7 +4363,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-@@ -3076,8 +3812,8 @@
+@@ -3076,8 +3808,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
@@ -6985,7 +4374,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3090,30 +3826,32 @@
+@@ -3090,30 +3822,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7025,35 +4414,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3131,10 +3869,10 @@
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset x;
-+ const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *ccp;
-- char **p;
-+ 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 +3881,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);
-+ pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++ccp;
-- p = (char**) ccp;
-- ccp = (char const *const *) p;
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+@@ -3153,6 +3887,7 @@
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -7061,17 +4422,17 @@ diff -urNad cyrus-imapd-2.2.13~/configur
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -3171,7 +3910,9 @@
+@@ -3171,7 +3906,9 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
+ if (!foo) return 0;
}
-+ return !cs[0] && !zero.x;
++ return !x[0] && !zero.x;
#endif
;
-@@ -3179,24 +3920,36 @@
+@@ -3179,24 +3916,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7116,7 +4477,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3205,12 +3958,13 @@
+@@ -3205,12 +3954,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7134,7 +4495,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -3219,62 +3973,8 @@
+@@ -3219,62 +3969,8 @@
fi
@@ -7199,7 +4560,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3294,39 +3994,54 @@
+@@ -3294,39 +3990,54 @@
_ACEOF
rm -f conftest.$ac_objext
@@ -7266,7 +4627,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
case $ac_cv_c_inline in
-@@ -3345,157 +4060,8 @@
+@@ -3345,157 +4056,8 @@
esac
@@ -7426,7 +4787,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3519,24 +4085,36 @@
+@@ -3519,24 +4081,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7471,7 +4832,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3545,9 +4123,10 @@
+@@ -3545,9 +4119,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7484,7 +4845,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3603,6 +4182,7 @@
+@@ -3603,6 +4178,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -7492,7 +4853,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3622,18 +4202,27 @@
+@@ -3622,18 +4198,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -7526,7 +4887,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3646,12 +4235,14 @@
+@@ -3646,12 +4231,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -7544,7 +4905,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -3674,9 +4265,9 @@
+@@ -3674,9 +4261,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -7557,7 +4918,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3690,24 +4281,36 @@
+@@ -3690,24 +4277,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -7602,7 +4963,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3716,12 +4319,14 @@
+@@ -3716,12 +4315,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7621,7 +4982,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3732,9 +4337,9 @@
+@@ -3732,9 +4333,9 @@
done
@@ -7634,7 +4995,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3744,61 +4349,74 @@
+@@ -3744,58 +4345,72 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7715,10 +5076,6 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-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
@@ -7726,18 +5083,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
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 +4426,12 @@
++ if test "$ac_cv_type_long_long_int" = yes; 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.
+@@ -3808,10 +4423,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -7746,7 +5101,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -3819,24 +4439,36 @@
+@@ -3819,24 +4435,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7791,12 +5146,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3849,10 +4481,12 @@
+@@ -3849,10 +4477,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -7805,7 +5159,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -3860,24 +4494,36 @@
+@@ -3860,24 +4489,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7850,7 +5204,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3886,30 +4532,33 @@
+@@ -3886,30 +4527,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7883,8 +5237,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -7893,7 +5246,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -3917,24 +4566,36 @@
+@@ -3917,24 +4560,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7938,12 +5291,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3947,10 +4608,12 @@
+@@ -3947,10 +4602,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -7952,7 +5304,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -3958,24 +4621,36 @@
+@@ -3958,24 +4614,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7997,7 +5349,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3984,24 +4659,27 @@
+@@ -3984,24 +4652,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8035,12 +5387,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# 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 +4690,12 @@
+@@ -4012,10 +4683,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -8049,7 +5400,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -4023,24 +4703,36 @@
+@@ -4023,24 +4695,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8094,7 +5445,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4049,25 +4741,536 @@
+@@ -4049,25 +4733,519 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8109,17 +5460,13 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+?*) 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)
++'') { { 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), 77
+echo "$as_me: error: cannot compute sizeof (long long int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long_int=0
-+ fi ;;
++ { (exit 77); exit 77; }; } ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
@@ -8129,8 +5476,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
++ 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>
@@ -8176,38 +5522,34 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ 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_long_int=`cat conftest.val`
-+else
+ 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)
++{ { 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
+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
++else
++ ac_cv_sizeof_long_long_int=0
++fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6; }
-+
-+
-+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
+_ACEOF
@@ -8255,7 +5597,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
- esac
++esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
@@ -8284,15 +5626,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+{ 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
++else
++ if test "$ac_cv_type_unsigned_long_long_int" = yes; 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.
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ # Depending upon the size, compute the lo and hi bounds.
@@ -8303,8 +5646,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ typedef unsigned long long int ac__type_sizeof_;
+int
+main ()
+{
@@ -8358,8 +5700,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ typedef unsigned long long int ac__type_sizeof_;
+int
+main ()
+{
@@ -8430,8 +5771,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ typedef unsigned long long int ac__type_sizeof_;
+int
+main ()
+{
@@ -8485,8 +5825,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ typedef unsigned long long int ac__type_sizeof_;
+int
+main ()
+{
@@ -8567,8 +5906,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ typedef unsigned long long int ac__type_sizeof_;
+int
+main ()
+{
@@ -8625,35 +5963,30 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+done
+case $ac_lo in
+?*) 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)
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot compute sizeof (unsigned long long int)
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 ;;
++ { (exit 77); exit 77; }; } ;;
+esac
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4076,8 +5279,10 @@
+@@ -4076,8 +5254,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef unsigned long long int ac__type_sizeof_;
-+
++ 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>
int
-@@ -4086,177 +5291,1067 @@
+@@ -4086,177 +5265,1049 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -8720,8 +6053,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
( 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)
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
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)
@@ -8730,37 +6062,41 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-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
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
+ else
+- ac_cv_sizeof_long=0
++ ac_cv_sizeof_unsigned_long_long_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
+#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
-+_ACEOF
-+
-+
+ _ACEOF
+
+
+if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
+ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
-+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_LONG_INT
+_ACEOF
-+
+
+- # CMU GUESS RUNPATH SWITCH
+- echo "$as_me:$LINENO: checking for runpath switch" >&5
+-echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
+-if test "${andrew_runpath_switch+set}" = set; then
+ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_sizeof_long=0
+ # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -8770,12 +6106,15 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
-+
+
+- # first, try -R
+- SAVE_LDFLAGS="${LDFLAGS}"
+- LDFLAGS="-R /usr/lib"
+- cat >conftest.$ac_ext <<_ACEOF
+int
+main ()
+{
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+
@@ -8819,25 +6158,28 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ (exit $ac_status); }; }; then
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
-+
-+int
-+main ()
-+{
+
+ int
+ main ()
+ {
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
-+
-+ ;
-+ 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
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
@@ -8846,12 +6188,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -8859,9 +6205,12 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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); }; } &&
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -8869,17 +6218,19 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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=yes
-+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_c_bigendian=no
- fi
-+
++fi
+
+- LDFLAGS="-Wl,-rpath,/usr/lib"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ echo "$as_me: failed program was:" >&5
@@ -8945,11 +6296,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ (exit $ac_status); }; }; then
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+ ac_cv_c_bigendian=yes
- 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
++fi
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
@@ -8969,7 +6316,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
- _ACEOF
++_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
@@ -8977,7 +6324,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+int
+main ()
+{
-
++
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
@@ -8986,7 +6333,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
-
++
+ ;
+ return 0;
+}
@@ -9016,17 +6363,13 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-
++
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
-
-- # 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
++
+
+fi
+
@@ -9057,12 +6400,9 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+{ 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
-
-- # first, try -R
-- SAVE_LDFLAGS="${LDFLAGS}"
-- LDFLAGS="-R /usr/lib"
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
@@ -9302,15 +6642,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+{ 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 "$ac_cv_type_long" = yes; 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
@@ -9320,8 +6661,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
+int
+main ()
+{
@@ -9375,21 +6715,17 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_includes_default
-+ typedef long ac__type_sizeof_;
-
- int
- main ()
- {
++ 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 conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
++
++ ;
++ return 0;
++}
++_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
@@ -9398,16 +6734,12 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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 -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&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'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9415,12 +6747,9 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9428,15 +6757,14 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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
-- andrew_runpath_switch="-R"
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
++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=
@@ -9444,8 +6772,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
-
-- LDFLAGS="-Wl,-rpath,/usr/lib"
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
@@ -9459,14 +6786,13 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ 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;
+}
@@ -9507,15 +6833,14 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
++ 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_;
-
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -9615,8 +6940,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
+int
+main ()
+{
@@ -9673,15 +6997,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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)
++'') { { 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 ;;
++ { (exit 77); exit 77; }; } ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
@@ -9691,8 +7011,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ 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>
@@ -9751,25 +7070,21 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+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)
++{ { 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
++else
++ ac_cv_sizeof_long=0
++fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
@@ -9783,7 +7098,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-@@ -4265,18 +6360,19 @@
+@@ -4265,18 +6316,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`
@@ -9811,7 +7126,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4287,24 +6383,36 @@
+@@ -4287,24 +6339,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -9856,7 +7171,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4313,15 +6421,16 @@
+@@ -4313,15 +6377,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9879,7 +7194,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4330,8 +6439,13 @@
+@@ -4330,8 +6395,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -9895,7 +7210,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4355,9 +6469,10 @@
+@@ -4355,9 +6425,10 @@
ac_header_preproc=no
fi
@@ -9908,7 +7223,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4381,25 +6496,19 @@
+@@ -4381,25 +6452,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;}
@@ -9941,7 +7256,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4418,9 +6527,9 @@
+@@ -4418,9 +6483,9 @@
for ac_func in memmove strcasecmp ftruncate strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -9954,7 +7269,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4446,53 +6555,59 @@
+@@ -4446,53 +6511,59 @@
#undef $ac_func
@@ -10033,7 +7348,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4501,25 +6616,25 @@
+@@ -4501,25 +6572,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10042,7 +7357,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -10068,7 +7383,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
esac
fi
-@@ -4531,9 +6646,9 @@
+@@ -4531,9 +6602,9 @@
for ac_func in strlcat strlcpy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10081,7 +7396,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4559,53 +6674,59 @@
+@@ -4559,53 +6630,59 @@
#undef $ac_func
@@ -10160,7 +7475,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4614,13 +6735,15 @@
+@@ -4614,13 +6691,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10169,7 +7484,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -10180,7 +7495,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -4637,9 +6760,9 @@
+@@ -4637,9 +6716,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`
@@ -10193,7 +7508,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4661,24 +6784,36 @@
+@@ -4661,24 +6740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -10238,7 +7553,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4687,12 +6822,14 @@
+@@ -4687,12 +6778,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10257,7 +7572,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -4704,13 +6841,12 @@
+@@ -4704,13 +6797,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -10273,7 +7588,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4718,126 +6854,99 @@
+@@ -4718,126 +6810,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10409,7 +7724,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -10451,7 +7766,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4845,115 +6954,89 @@
+@@ -4845,115 +6910,89 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10587,7 +7902,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -10616,7 +7931,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-@@ -4963,8 +7046,8 @@
+@@ -4963,8 +7002,8 @@
save_LIBS="$LIBS"
LIB_SOCKET=""
@@ -10627,7 +7942,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4991,53 +7074,59 @@
+@@ -4991,53 +7030,59 @@
#undef connect
@@ -10706,7 +8021,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5046,18 +7135,19 @@
+@@ -5046,18 +7091,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10715,7 +8030,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -10732,7 +8047,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5070,40 +7160,52 @@
+@@ -5070,40 +7116,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10797,7 +8112,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5112,20 +7214,21 @@
+@@ -5112,20 +7170,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10806,7 +8121,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -10825,7 +8140,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5138,40 +7241,52 @@
+@@ -5138,40 +7197,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10890,7 +8205,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5180,14 +7295,15 @@
+@@ -5180,14 +7251,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10899,7 +8214,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -10910,7 +8225,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_socket_connect = yes; then
LIB_SOCKET="-lsocket $LIB_SOCKET"
fi
-@@ -5196,8 +7312,8 @@
+@@ -5196,8 +7268,8 @@
fi
LIBS="$LIB_SOCKET $save_LIBS"
@@ -10921,7 +8236,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5224,53 +7340,59 @@
+@@ -5224,53 +7296,59 @@
#undef res_search
@@ -11000,7 +8315,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5279,13 +7401,14 @@
+@@ -5279,13 +7357,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11009,7 +8324,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
@@ -11019,7 +8334,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_func_res_search = yes; then
:
else
-@@ -5318,24 +7441,36 @@
+@@ -5318,24 +7397,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11064,7 +8379,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5344,8 +7479,10 @@
+@@ -5344,8 +7435,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11072,11 +8387,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -5356,9 +7493,9 @@
+@@ -5356,9 +7449,9 @@
for ac_func in dn_expand dns_lookup
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11089,7 +8404,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -5384,53 +7521,59 @@
+@@ -5384,53 +7477,59 @@
#undef $ac_func
@@ -11168,7 +8483,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5439,13 +7582,15 @@
+@@ -5439,13 +7538,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11177,7 +8492,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -11188,7 +8503,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -5461,8 +7606,8 @@
+@@ -5461,8 +7562,8 @@
cyrus_cv_getaddrinfo=yes
@@ -11199,7 +8514,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5489,53 +7634,59 @@
+@@ -5489,53 +7590,59 @@
#undef getaddrinfo
@@ -11278,7 +8593,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5544,20 +7695,21 @@
+@@ -5544,20 +7651,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11287,7 +8602,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
@@ -11306,7 +8621,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5570,40 +7722,52 @@
+@@ -5570,40 +7678,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11371,7 +8686,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5612,21 +7776,22 @@
+@@ -5612,21 +7732,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11380,7 +8695,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11400,7 +8715,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5636,8 +7801,8 @@
+@@ -5636,8 +7757,8 @@
fi
done
fi
@@ -11411,7 +8726,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_getaddrinfo=no
else
-@@ -5646,8 +7811,8 @@
+@@ -5646,8 +7767,8 @@
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -11422,7 +8737,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5660,40 +7825,52 @@
+@@ -5660,40 +7781,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11487,7 +8802,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5702,14 +7879,15 @@
+@@ -5702,14 +7835,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11496,7 +8811,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11507,7 +8822,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_inet6_getaddrinfo = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -5744,9 +7922,9 @@
+@@ -5744,9 +7878,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`
@@ -11520,7 +8835,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -5772,53 +7950,59 @@
+@@ -5772,53 +7906,59 @@
#undef ${ipv6_cv_pfx}getaddrinfo
@@ -11599,7 +8914,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5827,13 +8011,15 @@
+@@ -5827,13 +7967,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11608,7 +8923,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -11619,7 +8934,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
rm -f conftest*
-@@ -5852,8 +8038,8 @@
+@@ -5852,8 +7994,8 @@
fi
if test $ipv6_cv_getaddrinfo = yes; then
@@ -11630,7 +8945,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5880,53 +8066,59 @@
+@@ -5880,53 +8022,59 @@
#undef gai_strerror
@@ -11709,7 +9024,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5935,20 +8127,21 @@
+@@ -5935,20 +8083,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11718,7 +9033,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
@@ -11737,7 +9052,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5961,40 +8154,52 @@
+@@ -5961,40 +8110,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11802,7 +9117,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6003,21 +8208,22 @@
+@@ -6003,21 +8164,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11811,7 +9126,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11831,7 +9146,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6027,8 +8233,8 @@
+@@ -6027,8 +8189,8 @@
fi
done
fi
@@ -11842,7 +9157,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_gai_strerror=no
else
-@@ -6037,8 +8243,8 @@
+@@ -6037,8 +8199,8 @@
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -11853,7 +9168,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6051,40 +8257,52 @@
+@@ -6051,40 +8213,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11918,7 +9233,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6093,14 +8311,15 @@
+@@ -6093,14 +8267,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11927,7 +9242,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11938,7 +9253,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_inet6_gai_strerror = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -6135,9 +8354,9 @@
+@@ -6135,9 +8310,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`
@@ -11951,7 +9266,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -6163,53 +8382,59 @@
+@@ -6163,53 +8338,59 @@
#undef ${ipv6_cv_pfx}gai_strerror
@@ -12030,7 +9345,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6218,13 +8443,15 @@
+@@ -6218,13 +8399,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12039,7 +9354,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -12050,7 +9365,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
rm -f conftest*
-@@ -6260,8 +8487,8 @@
+@@ -6260,8 +8443,8 @@
cyrus_cv_getnameinfo=yes
@@ -12061,7 +9376,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6288,53 +8515,59 @@
+@@ -6288,53 +8471,59 @@
#undef getnameinfo
@@ -12140,7 +9455,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6343,20 +8576,21 @@
+@@ -6343,20 +8532,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12149,7 +9464,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
@@ -12168,7 +9483,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6369,40 +8603,52 @@
+@@ -6369,40 +8559,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12233,7 +9548,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6411,21 +8657,22 @@
+@@ -6411,21 +8613,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12242,7 +9557,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -12262,7 +9577,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6435,8 +8682,8 @@
+@@ -6435,8 +8638,8 @@
fi
done
fi
@@ -12273,7 +9588,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_getnameinfo=no
else
-@@ -6445,8 +8692,8 @@
+@@ -6445,8 +8648,8 @@
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -12284,7 +9599,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6459,40 +8706,52 @@
+@@ -6459,40 +8662,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12349,7 +9664,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6501,14 +8760,15 @@
+@@ -6501,14 +8716,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12358,7 +9673,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -12369,7 +9684,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_inet6_getnameinfo = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -6543,9 +8803,9 @@
+@@ -6543,9 +8759,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`
@@ -12382,7 +9697,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -6571,53 +8831,59 @@
+@@ -6571,53 +8787,59 @@
#undef ${ipv6_cv_pfx}getnameinfo
@@ -12461,7 +9776,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6626,13 +8892,15 @@
+@@ -6626,13 +8848,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12470,7 +9785,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -12481,7 +9796,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
rm -f conftest*
-@@ -6664,8 +8932,8 @@
+@@ -6664,8 +8888,8 @@
fi
@@ -12492,7 +9807,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ipv6_cv_ss_family+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6686,24 +8954,36 @@
+@@ -6686,24 +8910,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12537,7 +9852,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6712,9 +8992,10 @@
+@@ -6712,9 +8948,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12550,7 +9865,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ipv6_cv_ss_family = yes; then
-@@ -6725,11 +9006,11 @@
+@@ -6725,11 +8962,11 @@
else
:
fi
@@ -12566,7 +9881,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ipv6_cv_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6750,24 +9031,36 @@
+@@ -6750,24 +8987,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12611,7 +9926,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6776,9 +9069,10 @@
+@@ -6776,9 +9025,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12624,7 +9939,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ipv6_cv_sa_len = yes; then
-@@ -6789,8 +9083,8 @@
+@@ -6789,8 +9039,8 @@
else
:
fi
@@ -12635,7 +9950,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-@@ -6798,18 +9092,19 @@
+@@ -6798,18 +9048,19 @@
for ac_header in sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12663,7 +9978,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6820,24 +9115,36 @@
+@@ -6820,24 +9071,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12708,7 +10023,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6846,15 +9153,16 @@
+@@ -6846,15 +9109,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12731,7 +10046,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6863,8 +9171,13 @@
+@@ -6863,8 +9127,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12747,7 +10062,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6888,9 +9201,10 @@
+@@ -6888,9 +9157,10 @@
ac_header_preproc=no
fi
@@ -12760,7 +10075,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6914,25 +9228,19 @@
+@@ -6914,25 +9184,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;}
@@ -12793,7 +10108,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6944,8 +9252,8 @@
+@@ -6944,8 +9208,8 @@
done
@@ -12804,7 +10119,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6969,24 +9277,36 @@
+@@ -6969,24 +9233,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12849,7 +10164,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6995,12 +9315,13 @@
+@@ -6995,12 +9271,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12867,7 +10182,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7009,8 +9330,8 @@
+@@ -7009,8 +9286,8 @@
fi
@@ -12878,7 +10193,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_struct_tm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7032,24 +9353,36 @@
+@@ -7032,24 +9309,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12923,7 +10238,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7058,12 +9391,13 @@
+@@ -7058,12 +9347,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12941,7 +10256,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
-@@ -7072,8 +9406,8 @@
+@@ -7072,8 +9362,8 @@
fi
@@ -12952,7 +10267,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7098,24 +9432,36 @@
+@@ -7098,24 +9388,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12997,7 +10312,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7124,7 +9470,7 @@
+@@ -7124,7 +9426,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13006,7 +10321,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -7145,24 +9491,36 @@
+@@ -7145,24 +9447,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -13051,7 +10366,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7171,14 +9529,16 @@
+@@ -7171,14 +9485,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13073,7 +10388,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_member_struct_tm_tm_zone = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -7195,8 +9555,95 @@
+@@ -7195,8 +9511,95 @@
_ACEOF
else
@@ -13171,7 +10486,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_var_tzname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7207,37 +9654,49 @@
+@@ -7207,37 +9610,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <time.h>
@@ -13232,7 +10547,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7246,13 +9705,14 @@
+@@ -7246,13 +9661,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13241,7 +10556,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
@@ -13251,7 +10566,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_var_tzname = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7272,9 +9732,9 @@
+@@ -7272,9 +9688,9 @@
for ac_func in vprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13264,7 +10579,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -7300,53 +9760,59 @@
+@@ -7300,53 +9716,59 @@
#undef $ac_func
@@ -13343,7 +10658,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7355,20 +9821,22 @@
+@@ -7355,20 +9777,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13352,7 +10667,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -13372,7 +10687,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func__doprnt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7395,53 +9863,59 @@
+@@ -7395,53 +9819,59 @@
#undef _doprnt
@@ -13451,7 +10766,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7450,13 +9924,14 @@
+@@ -7450,13 +9880,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13460,7 +10775,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
@@ -13470,7 +10785,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_func__doprnt = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7475,20 +9950,20 @@
+@@ -7475,20 +9906,20 @@
@@ -13499,7 +10814,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
case "$with_bdb" in
no)
-@@ -7510,21 +9985,21 @@
+@@ -7510,21 +9941,21 @@
if test "$use_berkeley" != "no"; then
@@ -13529,7 +10844,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-@@ -7539,17 +10014,17 @@
+@@ -7539,17 +9970,17 @@
fi
if test "${ac_cv_header_db_h+set}" = set; then
@@ -13553,7 +10868,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7560,24 +10035,36 @@
+@@ -7560,24 +9991,36 @@
#include <db.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -13598,7 +10913,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7586,15 +10073,16 @@
+@@ -7586,15 +10029,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13621,7 +10936,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7603,8 +10091,13 @@
+@@ -7603,8 +10047,13 @@
/* end confdefs.h. */
#include <db.h>
_ACEOF
@@ -13637,7 +10952,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -7628,9 +10121,10 @@
+@@ -7628,9 +10077,10 @@
ac_header_preproc=no
fi
@@ -13650,7 +10965,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7654,25 +10148,18 @@
+@@ -7654,25 +10104,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;}
@@ -13681,7 +10996,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_db_h = yes; then
-@@ -7720,24 +10207,36 @@
+@@ -7701,7 +10144,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7720,24 +10163,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13726,7 +11050,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7746,9 +10245,10 @@
+@@ -7746,9 +10201,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13735,11 +11059,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$dblib" = "berkeley"; then break; fi
done
-@@ -7770,24 +10270,36 @@
+@@ -7770,24 +10226,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13784,7 +11108,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7796,9 +10308,10 @@
+@@ -7796,9 +10264,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13793,11 +11117,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
LIBS=$saved_LIBS
-@@ -7854,13 +10367,13 @@
+@@ -7854,13 +10323,13 @@
SIEVE_SUBDIRS=""
sievedir="sieve"
@@ -13815,7 +11139,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "$sievedir" != "no"; then
SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-@@ -7879,8 +10392,8 @@
+@@ -7879,8 +10348,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
@@ -13826,7 +11150,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_YACC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7893,25 +10406,27 @@
+@@ -7893,25 +10362,27 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13859,7 +11183,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test -n "$YACC" && break
done
test -n "$YACC" || YACC="yacc"
-@@ -7920,8 +10435,8 @@
+@@ -7920,8 +10391,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
@@ -13870,7 +11194,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_LEX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7934,236 +10449,196 @@
+@@ -7934,33 +10405,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13904,152 +11228,129 @@ diff -urNad cyrus-imapd-2.2.13~/configur
done
test -n "$LEX" || LEX=":"
--if test -z "$LEXLIB"
--then
+ if test -z "$LEXLIB"
+ then
- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
--if test "${ac_cv_lib_fl_yywrap+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
++ { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7973,40 +10446,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
-/* 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;
++/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char yywrap ();
+ char yywrap ();
int
--main ()
-+main (void)
+ main ()
{
-yywrap ();
-- ;
-- return 0;
-+ return ! yylex () + ! yywrap ();
++return yywrap ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++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
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (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); }; } &&
+ { 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
++ { (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
++ (eval "$ac_try") 2>&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
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ (exit $ac_status); }; }; then
+@@ -8015,19 +10500,20 @@
+ 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; }; }
++ ac_cv_lib_fl_yywrap=no
fi
-rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
++
++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_fl_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
--if test $ac_cv_lib_fl_yywrap = yes; then
-- LEXLIB="-lfl"
--else
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
+ if test $ac_cv_lib_fl_yywrap = yes; then
+ LEXLIB="-lfl"
+ else
- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
--if test "${ac_cv_lib_l_yywrap+set}" = set; then
-+{ echo "$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 "$as_me:$LINENO: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_l_yywrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ll $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+@@ -8040,40 +10526,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char yywrap ();
--int
--main ()
--{
+ char yywrap ();
+ int
+ main ()
+ {
-yywrap ();
-- ;
-- 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`
++return yywrap ();
+ ;
+ return 0;
+ }
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -14093,87 +11394,72 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_lib_l_yywrap=yes
-+ ac_cv_lib_lex=$ac_lib
- else
+@@ -8082,14 +10580,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_l_yywrap=no
--fi
++ ac_cv_lib_l_yywrap=no
+ fi
-rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++
++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_l_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
--if test $ac_cv_lib_l_yywrap = yes; then
-- LEXLIB="-ll"
--fi
-
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
+ if test $ac_cv_lib_l_yywrap = yes; then
+ LEXLIB="-ll"
+ fi
+@@ -8099,8 +10598,8 @@
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
-
--if test "x$LEX" != "x:"; then
+ if test "x$LEX" != "x:"; then
- echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
--if test "${ac_cv_prog_lex_root+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # The minimal lex program is just a single line: %%. But some broken lexes
--# (Solaris, I think it was) want two %% lines, so accommodate them.
--cat >conftest.l <<_ACEOF
--%%
--%%
--_ACEOF
++ { 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
+@@ -8110,8 +10609,13 @@
+ %%
+ %%
+ _ACEOF
-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
- (eval $LEX conftest.l) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--if test -f lex.yy.c; then
-- ac_cv_prog_lex_root=lex.yy
--elif test -f lexyy.c; then
-- ac_cv_prog_lex_root=lexyy
--else
-- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
--echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-- { (exit 1); exit 1; }; }
++{ (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
+ (exit $ac_status); }
+@@ -8125,13 +10629,13 @@
+ { (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
-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: 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
--# 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
--echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
- ac_save_LIBS=$LIBS
--LIBS="$LIBS $LEXLIB"
-+LIBS="$LEXLIB $ac_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+#define YYTEXT_POINTER 1
+@@ -8146,24 +10650,36 @@
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14218,7 +11504,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8172,15 +10647,16 @@
+@@ -8172,15 +10688,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14226,10 +11512,10 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_save_LIBS
--rm -f "${LEX_OUTPUT_ROOT}.c"
+ rm -f "${LEX_OUTPUT_ROOT}.c"
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
@@ -14239,11 +11525,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_prog_lex_yytext_pointer = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8188,11 +10664,12 @@
- _ACEOF
-
- fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+@@ -8191,8 +10709,8 @@
fi
@@ -14254,7 +11536,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_fl_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8209,30 +10686,42 @@
+@@ -8209,30 +10727,42 @@
int
main ()
{
@@ -14306,7 +11588,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8241,14 +10730,15 @@
+@@ -8241,14 +10771,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14315,7 +11597,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -14326,7 +11608,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_fl_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFL 1
-@@ -8259,13 +10749,12 @@
+@@ -8259,13 +10790,12 @@
fi
@@ -14342,7 +11624,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8273,115 +10762,89 @@
+@@ -8273,115 +10803,89 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14478,7 +11760,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_regcomp+set}" = set; then
+ break
@@ -14507,7 +11789,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >>confdefs.h <<\_ACEOF
-@@ -8389,17 +10852,17 @@
+@@ -8389,17 +10893,17 @@
_ACEOF
if test "${ac_cv_header_rxposix_h+set}" = set; then
@@ -14531,7 +11813,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8410,24 +10873,36 @@
+@@ -8410,24 +10914,36 @@
#include <rxposix.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -14576,7 +11858,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8436,15 +10911,16 @@
+@@ -8436,15 +10952,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14599,7 +11881,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8453,8 +10929,13 @@
+@@ -8453,8 +10970,13 @@
/* end confdefs.h. */
#include <rxposix.h>
_ACEOF
@@ -14615,7 +11897,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8478,9 +10959,10 @@
+@@ -8478,9 +11000,10 @@
ac_header_preproc=no
fi
@@ -14628,7 +11910,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8504,25 +10986,18 @@
+@@ -8504,25 +11027,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;}
@@ -14659,7 +11941,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_rxposix_h = yes; then
-@@ -8544,8 +11019,8 @@
+@@ -8544,8 +11060,8 @@
@@ -14670,7 +11952,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8572,53 +11047,59 @@
+@@ -8572,53 +11088,59 @@
#undef strerror
@@ -14749,7 +12031,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8627,13 +11108,14 @@
+@@ -8627,13 +11149,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14758,7 +12040,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
@@ -14768,7 +12050,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_func_strerror = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8653,18 +11135,19 @@
+@@ -8653,18 +11176,19 @@
for ac_header in sys/resource.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14796,7 +12078,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8675,24 +11158,36 @@
+@@ -8675,24 +11199,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -14841,7 +12123,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8701,15 +11196,16 @@
+@@ -8701,15 +11237,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14864,7 +12146,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8718,8 +11214,13 @@
+@@ -8718,8 +11255,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -14880,7 +12162,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8743,9 +11244,10 @@
+@@ -8743,9 +11285,10 @@
ac_header_preproc=no
fi
@@ -14893,7 +12175,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8769,25 +11271,19 @@
+@@ -8769,25 +11312,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;}
@@ -14926,7 +12208,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8803,9 +11299,9 @@
+@@ -8803,9 +11340,9 @@
for ac_func in setrlimit
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14939,7 +12221,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8831,53 +11327,59 @@
+@@ -8831,53 +11368,59 @@
#undef $ac_func
@@ -15018,7 +12300,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8886,13 +11388,15 @@
+@@ -8886,13 +11429,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15027,7 +12309,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -15038,7 +12320,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8905,9 +11409,9 @@
+@@ -8905,9 +11450,9 @@
for ac_func in getrlimit
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -15051,7 +12333,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8933,53 +11437,59 @@
+@@ -8933,53 +11478,59 @@
#undef $ac_func
@@ -15130,7 +12412,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8988,13 +11498,15 @@
+@@ -8988,13 +11539,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15139,7 +12421,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -15150,7 +12432,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9009,9 +11521,9 @@
+@@ -9009,9 +11562,9 @@
for ac_func in daemon setsid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -15163,7 +12445,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -9037,53 +11549,59 @@
+@@ -9037,53 +11590,59 @@
#undef $ac_func
@@ -15242,7 +12524,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9092,13 +11610,15 @@
+@@ -9092,13 +11651,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15251,7 +12533,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -15262,7 +12544,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9112,9 +11632,9 @@
+@@ -9112,9 +11673,9 @@
for ac_func in shutdown
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -15275,7 +12557,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -9140,53 +11660,59 @@
+@@ -9140,53 +11701,59 @@
#undef $ac_func
@@ -15354,7 +12636,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9195,13 +11721,15 @@
+@@ -9195,13 +11762,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15363,7 +12645,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -15374,7 +12656,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9270,8 +11798,8 @@
+@@ -9270,8 +11839,8 @@
spt_type=""
@@ -15385,7 +12667,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9298,53 +11826,59 @@
+@@ -9298,53 +11867,59 @@
#undef setproctitle
@@ -15464,7 +12746,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9353,20 +11887,21 @@
+@@ -9353,20 +11928,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15473,7 +12755,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
@@ -15492,7 +12774,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_util_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9379,40 +11914,52 @@
+@@ -9379,40 +11955,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15557,7 +12839,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9421,14 +11968,15 @@
+@@ -9421,14 +12009,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15566,7 +12848,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15577,7 +12859,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_util_setproctitle = yes; then
spt_type=SPT_BUILTIN
LIBS="${LIBS} -lutil"
-@@ -9437,17 +11985,17 @@
+@@ -9437,17 +12026,17 @@
fi
if test "$spt_type" = ""; then
if test "${ac_cv_header_sys_pstat_h+set}" = set; then
@@ -15601,7 +12883,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9458,24 +12006,36 @@
+@@ -9458,24 +12047,36 @@
#include <sys/pstat.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -15646,7 +12928,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9484,15 +12044,16 @@
+@@ -9484,15 +12085,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15669,7 +12951,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9501,8 +12062,13 @@
+@@ -9501,8 +12103,13 @@
/* end confdefs.h. */
#include <sys/pstat.h>
_ACEOF
@@ -15685,7 +12967,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -9526,9 +12092,10 @@
+@@ -9526,9 +12133,10 @@
ac_header_preproc=no
fi
@@ -15698,7 +12980,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9552,25 +12119,18 @@
+@@ -9552,25 +12160,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;}
@@ -15729,7 +13011,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_sys_pstat_h = yes; then
-@@ -9581,17 +12141,17 @@
+@@ -9581,17 +12182,17 @@
fi
if test "$spt_type" = ""; then
if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
@@ -15753,7 +13035,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9602,24 +12162,36 @@
+@@ -9602,24 +12203,36 @@
#include <sys/sysnews.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -15798,7 +13080,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9628,15 +12200,16 @@
+@@ -9628,15 +12241,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15821,7 +13103,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9645,8 +12218,13 @@
+@@ -9645,8 +12259,13 @@
/* end confdefs.h. */
#include <sys/sysnews.h>
_ACEOF
@@ -15837,7 +13119,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -9670,9 +12248,10 @@
+@@ -9670,9 +12289,10 @@
ac_header_preproc=no
fi
@@ -15850,7 +13132,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9696,25 +12275,18 @@
+@@ -9696,25 +12316,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;}
@@ -15881,7 +13163,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_sys_sysnews_h = yes; then
-@@ -9724,61 +12296,72 @@
+@@ -9724,61 +12337,72 @@
fi
if test "$spt_type" = ""; then
@@ -15987,7 +13269,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_sys_sco+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9793,8 +12376,13 @@
+@@ -9793,8 +12417,13 @@
#include </nonexistent>
#endif
_ACEOF
@@ -16003,7 +13285,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -9818,18 +12406,19 @@
+@@ -9818,18 +12447,19 @@
cyrus_cv_sys_sco=no
fi
@@ -16027,7 +13309,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_sys_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9844,8 +12433,13 @@
+@@ -9844,8 +12474,13 @@
#include </nonexistent>
#endif
_ACEOF
@@ -16043,7 +13325,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -9869,14 +12463,15 @@
+@@ -9869,14 +12504,15 @@
cyrus_cv_sys_setproctitle=no
fi
@@ -16061,7 +13343,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test "$spt_type" != ""; then
-@@ -9886,8 +12481,8 @@
+@@ -9886,8 +12522,8 @@
fi
@@ -16072,7 +13354,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_sys_nonblock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9912,24 +12507,36 @@
+@@ -9912,24 +12548,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16117,7 +13399,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9938,19 +12545,20 @@
+@@ -9938,19 +12586,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16126,7 +13408,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -16144,7 +13426,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9973,24 +12581,36 @@
+@@ -9973,24 +12622,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16189,7 +13471,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9999,17 +12619,18 @@
+@@ -9999,17 +12660,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16214,7 +13496,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_func_mmap_shared+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10049,13 +12670,22 @@
+@@ -10049,13 +12711,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -16241,7 +13523,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10068,17 +12698,19 @@
+@@ -10068,17 +12739,19 @@
( exit $ac_status )
cyrus_cv_func_mmap_shared=no
fi
@@ -16266,7 +13548,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10119,13 +12751,22 @@
+@@ -10119,13 +12792,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -16293,7 +13575,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10138,12 +12779,14 @@
+@@ -10138,12 +12820,14 @@
( exit $ac_status )
cyrus_cv_func_mmap_stupidshared=no
fi
@@ -16311,7 +13593,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $cyrus_cv_func_mmap_stupidshared = yes; then
WITH_MAP="stupidshared"
else
-@@ -10157,14 +12800,13 @@
+@@ -10157,14 +12841,13 @@
@@ -16330,7 +13612,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_fcntl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10191,53 +12833,59 @@
+@@ -10191,53 +12874,59 @@
#undef fcntl
@@ -16409,7 +13691,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10246,19 +12894,20 @@
+@@ -10246,19 +12935,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16418,7 +13700,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
@@ -16436,7 +13718,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_flock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10285,53 +12934,59 @@
+@@ -10285,53 +12975,59 @@
#undef flock
@@ -16515,7 +13797,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10340,13 +12995,14 @@
+@@ -10340,13 +13036,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16524,7 +13806,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
@@ -16534,7 +13816,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_func_flock = yes; then
WITH_LOCK="flock"
else
-@@ -10361,13 +13017,14 @@
+@@ -10361,13 +13058,14 @@
fi
@@ -16552,7 +13834,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10394,53 +13051,59 @@
+@@ -10394,53 +13092,59 @@
#undef fdatasync
@@ -16631,7 +13913,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10449,13 +13112,14 @@
+@@ -10449,13 +13153,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16640,7 +13922,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
@@ -16650,7 +13932,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_func_fdatasync = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -10464,8 +13128,8 @@
+@@ -10464,8 +13169,8 @@
else
@@ -16661,7 +13943,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10478,40 +13142,52 @@
+@@ -10478,40 +13183,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16726,7 +14008,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10520,14 +13196,15 @@
+@@ -10520,14 +13237,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16735,7 +14017,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16746,7 +14028,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_rt_fdatasync = yes; then
LIB_RT="-lrt"
-@@ -10548,8 +13225,8 @@
+@@ -10548,8 +13266,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16757,7 +14039,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10576,53 +13253,59 @@
+@@ -10576,53 +13294,59 @@
#undef sigvec
@@ -16836,7 +14118,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10631,21 +13314,22 @@
+@@ -10631,21 +13355,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16845,7 +14127,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
@@ -16865,7 +14147,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10658,40 +13342,52 @@
+@@ -10658,40 +13383,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16930,7 +14212,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10700,22 +13396,23 @@
+@@ -10700,22 +13437,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16939,7 +14221,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16960,7 +14242,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10728,40 +13425,52 @@
+@@ -10728,40 +13466,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17025,7 +14307,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10770,14 +13479,15 @@
+@@ -10770,14 +13520,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17034,7 +14316,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17045,7 +14327,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_ucb_sigvec = yes; then
cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-@@ -10800,34 +13510,34 @@
+@@ -10800,34 +13551,34 @@
# all authentication goes through SASL
@@ -17092,7 +14374,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "x$with_afs" != "xno"; then
if test ! -d $with_afs; then
-@@ -10856,8 +13566,8 @@
+@@ -10856,8 +13607,8 @@
SAVE_LIBS="$LIBS"
LIBS="${with_afs}/lib/liblwp.a"
@@ -17103,7 +14385,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10874,30 +13584,42 @@
+@@ -10874,30 +13625,42 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17156,7 +14438,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cyrus_afs_sigvec="no"
else
-@@ -10905,12 +13627,13 @@
+@@ -10905,12 +13668,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17169,11 +14451,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -10960,8 +13683,8 @@
+@@ -10960,8 +13724,8 @@
CPPFLAGS=$LDAP_CPPFLAGS
LDFLAGS=$LDAP_LDFLAGS
@@ -17184,7 +14466,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10974,40 +13697,52 @@
+@@ -10974,40 +13738,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17249,7 +14531,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11016,14 +13751,15 @@
+@@ -11016,14 +13792,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17258,7 +14540,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17269,7 +14551,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_ldap_ldap_initialize = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -11052,46 +13788,46 @@
+@@ -11052,46 +13829,46 @@
fi
SERVER_SUBDIRS="master imap"
@@ -17334,7 +14616,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_resolv_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11104,40 +13840,52 @@
+@@ -11104,40 +13881,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17399,7 +14681,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11146,14 +13894,15 @@
+@@ -11146,14 +13935,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17408,7 +14690,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17419,7 +14701,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_resolv_res_search = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
-@@ -11172,16 +13921,16 @@
+@@ -11172,16 +13962,16 @@
if test "$with_krb" != "no"; then
@@ -17442,7 +14724,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11194,40 +13943,52 @@
+@@ -11194,40 +13984,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17507,7 +14789,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11236,14 +13997,15 @@
+@@ -11236,14 +14038,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17516,7 +14798,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17527,7 +14809,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
if test "$with_statickrb" = "yes"; then
KRB_LIBS="$with_krb/lib/libdes.a"
-@@ -11260,8 +14022,8 @@
+@@ -11260,8 +14063,8 @@
fi
if test -d ${with_krb}; then
@@ -17538,7 +14820,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_krbinclude+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11275,8 +14037,8 @@
+@@ -11275,8 +14078,8 @@
done
fi
@@ -17549,7 +14831,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test -n "${cyrus_krbinclude}"; then
CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -11299,17 +14061,17 @@
+@@ -11299,17 +14102,17 @@
if test "$with_des" != no; then
if test "${ac_cv_header_krb_h+set}" = set; then
@@ -17573,7 +14855,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11320,24 +14082,36 @@
+@@ -11320,24 +14123,36 @@
#include <krb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -17618,7 +14900,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11346,15 +14120,16 @@
+@@ -11346,15 +14161,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17641,7 +14923,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11363,8 +14138,13 @@
+@@ -11363,8 +14179,13 @@
/* end confdefs.h. */
#include <krb.h>
_ACEOF
@@ -17657,7 +14939,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -11388,9 +14168,10 @@
+@@ -11388,9 +14209,10 @@
ac_header_preproc=no
fi
@@ -17670,7 +14952,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11414,32 +14195,25 @@
+@@ -11414,32 +14236,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;}
@@ -17711,7 +14993,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11451,40 +14225,52 @@
+@@ -11451,40 +14266,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17776,7 +15058,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11493,14 +14279,16 @@
+@@ -11493,14 +14320,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17785,7 +15067,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17797,7 +15079,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
if test "$with_statickrb" = "yes"; then
KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-@@ -11539,11 +14327,11 @@
+@@ -11539,11 +14368,11 @@
IMAP_PROGS=""
@@ -17813,7 +15095,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
OPENSSL_INC=
OPENSSL_LIB=
-@@ -11551,8 +14339,8 @@
+@@ -11551,8 +14380,8 @@
no) with_openssl="no";;
""|yes)
LIB_RSAREF=""
@@ -17824,7 +15106,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11565,40 +14353,52 @@
+@@ -11565,40 +14394,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17889,7 +15171,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11607,14 +14407,15 @@
+@@ -11607,14 +14448,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17898,7 +15180,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17909,7 +15191,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
else
-@@ -11623,8 +14424,8 @@
+@@ -11623,8 +14465,8 @@
with_openssl="yes"
@@ -17920,7 +15202,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11637,40 +14438,52 @@
+@@ -11637,40 +14479,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17985,7 +15267,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11679,22 +14492,23 @@
+@@ -11679,22 +14533,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17994,7 +15276,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18015,7 +15297,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11707,40 +14521,52 @@
+@@ -11707,40 +14562,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18080,7 +15362,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11749,14 +14575,15 @@
+@@ -11749,14 +14616,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18089,7 +15371,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18100,7 +15382,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
LIBS="-lssl ${LIBS}"
else
-@@ -11788,10 +14615,10 @@
+@@ -11788,10 +14656,10 @@
LIBS="${LIBS} -lssl -lcrypto";;
esac
@@ -18115,7 +15397,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "$with_openssl" != "no"; then
-@@ -11817,12 +14644,12 @@
+@@ -11817,12 +14685,12 @@
@@ -18132,7 +15414,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test -n "$EGD_SOCKET" ; then
cat >>confdefs.h <<_ACEOF
-@@ -11832,11 +14659,11 @@
+@@ -11832,11 +14700,11 @@
fi
@@ -18148,7 +15430,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test -z "$with_zephyr"; then
if test -f /usr/local/lib/libzephyr.a; then
with_zephyr="/usr/local"
-@@ -11848,8 +14675,8 @@
+@@ -11848,8 +14716,8 @@
ZEPHYR_CPPFLAGS=""
case "$with_zephyr" in
no) true;;
@@ -18159,7 +15441,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11862,40 +14689,52 @@
+@@ -11862,40 +14730,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18224,7 +15506,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11904,14 +14743,15 @@
+@@ -11904,14 +14784,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18233,7 +15515,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18244,7 +15526,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_zephyr_ZInitialize = yes; then
ZEPHYR_LIBS="-lzephyr"
else
-@@ -11936,13 +14776,13 @@
+@@ -11936,13 +14817,13 @@
fi
@@ -18262,7 +15544,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
MASTERPIDFILE="\"$MASTERPIDFILE\""
cat >>confdefs.h <<_ACEOF
-@@ -11951,48 +14791,45 @@
+@@ -11951,48 +14832,45 @@
@@ -18328,7 +15610,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_com_err_com_err+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12005,40 +14842,52 @@
+@@ -12005,40 +14883,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18393,7 +15675,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12047,14 +14896,15 @@
+@@ -12047,14 +14937,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18402,7 +15684,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18413,7 +15695,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_com_err_com_err = yes; then
# com_err is already in library path
-@@ -12062,17 +14912,17 @@
+@@ -12062,17 +14953,17 @@
# can use system com_err
with_com_err=""
if test "${ac_cv_header_et_com_err_h+set}" = set; then
@@ -18437,7 +15719,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12083,24 +14933,36 @@
+@@ -12083,24 +14974,36 @@
#include <et/com_err.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -18482,7 +15764,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12109,15 +14971,16 @@
+@@ -12109,15 +15012,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18505,7 +15787,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12126,8 +14989,13 @@
+@@ -12126,8 +15030,13 @@
/* end confdefs.h. */
#include <et/com_err.h>
_ACEOF
@@ -18521,7 +15803,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -12151,9 +15019,10 @@
+@@ -12151,9 +15060,10 @@
ac_header_preproc=no
fi
@@ -18534,7 +15816,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12177,25 +15046,18 @@
+@@ -12177,25 +15087,18 @@
echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
@@ -18565,7 +15847,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_et_com_err_h = yes; then
-@@ -12206,17 +15068,17 @@
+@@ -12206,17 +15109,17 @@
else
if test "${ac_cv_header_com_err_h+set}" = set; then
@@ -18589,7 +15871,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12227,24 +15089,36 @@
+@@ -12227,24 +15130,36 @@
#include <com_err.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -18634,7 +15916,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12253,15 +15127,16 @@
+@@ -12253,15 +15168,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18657,7 +15939,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12270,8 +15145,13 @@
+@@ -12270,8 +15186,13 @@
/* end confdefs.h. */
#include <com_err.h>
_ACEOF
@@ -18673,7 +15955,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -12295,9 +15175,10 @@
+@@ -12295,9 +15216,10 @@
ac_header_preproc=no
fi
@@ -18686,7 +15968,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12321,25 +15202,18 @@
+@@ -12321,25 +15243,18 @@
echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
@@ -18717,7 +15999,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_com_err_h = yes; then
-@@ -12356,8 +15230,8 @@
+@@ -12356,8 +15271,8 @@
# Extract the first word of "compile_et", so it can be a program name with args.
set dummy compile_et; ac_word=$2
@@ -18728,7 +16010,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12372,37 +15246,38 @@
+@@ -12372,37 +15287,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18775,7 +16057,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12417,34 +15292,35 @@
+@@ -12417,34 +15333,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18819,7 +16101,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12459,28 +15335,29 @@
+@@ -12459,28 +15376,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18855,7 +16137,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
else
# use ours
with_com_err=yes
-@@ -12535,8 +15412,8 @@
+@@ -12535,8 +15453,8 @@
@@ -18866,7 +16148,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${cyrus_cv_lib_syslog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12551,8 +15428,13 @@
+@@ -12551,8 +15469,13 @@
#include </nonexistent>
#endif
_ACEOF
@@ -18882,7 +16164,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -12576,6 +15458,7 @@
+@@ -12576,6 +15499,7 @@
cyrus_cv_lib_syslog=no
fi
@@ -18890,7 +16172,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
rm -f conftest.err conftest.$ac_ext
fi
-@@ -12585,35 +15468,35 @@
+@@ -12585,35 +15509,35 @@
DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
fi
@@ -18939,7 +16221,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -12639,53 +15522,59 @@
+@@ -12639,53 +15563,59 @@
#undef $ac_func
@@ -19018,7 +16300,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12694,88 +15583,88 @@
+@@ -12694,88 +15624,88 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19027,7 +16309,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -19142,7 +16424,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12802,53 +15691,59 @@
+@@ -12802,53 +15732,59 @@
#undef dlopen
@@ -19221,7 +16503,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12857,19 +15752,20 @@
+@@ -12857,19 +15793,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19230,7 +16512,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -19248,7 +16530,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12882,40 +15778,52 @@
+@@ -12882,40 +15819,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19313,7 +16595,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12924,14 +15832,15 @@
+@@ -12924,14 +15873,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19322,7 +16604,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -19333,7 +16615,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_dl_dlopen = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
-@@ -12943,8 +15852,8 @@
+@@ -12943,8 +15893,8 @@
fi
@@ -19344,7 +16626,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12971,53 +15880,59 @@
+@@ -12971,53 +15921,59 @@
#undef crypt
@@ -19423,7 +16705,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13026,18 +15941,19 @@
+@@ -13026,18 +15982,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19432,7 +16714,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
@@ -19449,7 +16731,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13050,40 +15966,52 @@
+@@ -13050,40 +16007,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19514,7 +16796,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13092,14 +16020,15 @@
+@@ -13092,14 +16061,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19523,7 +16805,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -19534,7 +16816,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_crypt_crypt = yes; then
LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
else
-@@ -13112,21 +16041,21 @@
+@@ -13112,21 +16082,21 @@
@@ -19564,7 +16846,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "$gssapi" != no; then
platform=
-@@ -13179,17 +16108,17 @@
+@@ -13179,17 +16149,17 @@
fi
fi
if test "${ac_cv_header_gssapi_h+set}" = set; then
@@ -19588,7 +16870,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13200,24 +16129,36 @@
+@@ -13200,24 +16170,36 @@
#include <gssapi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -19633,7 +16915,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13226,15 +16167,16 @@
+@@ -13226,15 +16208,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19656,7 +16938,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13243,8 +16185,13 @@
+@@ -13243,8 +16226,13 @@
/* end confdefs.h. */
#include <gssapi.h>
_ACEOF
@@ -19672,7 +16954,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -13268,9 +16215,10 @@
+@@ -13268,9 +16256,10 @@
ac_header_preproc=no
fi
@@ -19685,7 +16967,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13294,25 +16242,18 @@
+@@ -13294,25 +16283,18 @@
echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
@@ -19716,7 +16998,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_gssapi_h = yes; then
-@@ -13323,17 +16264,17 @@
+@@ -13323,17 +16305,17 @@
else
if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
@@ -19740,7 +17022,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13344,24 +16285,36 @@
+@@ -13344,24 +16326,36 @@
#include <gssapi/gssapi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -19785,7 +17067,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13370,15 +16323,16 @@
+@@ -13370,15 +16364,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19808,7 +17090,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13387,8 +16341,13 @@
+@@ -13387,8 +16382,13 @@
/* end confdefs.h. */
#include <gssapi/gssapi.h>
_ACEOF
@@ -19824,7 +17106,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -13412,9 +16371,10 @@
+@@ -13412,9 +16412,10 @@
ac_header_preproc=no
fi
@@ -19837,7 +17119,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13438,25 +16398,18 @@
+@@ -13438,25 +16439,18 @@
echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
@@ -19868,7 +17150,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_gssapi_gssapi_h = yes; then
-@@ -13485,8 +16438,8 @@
+@@ -13485,8 +16479,8 @@
# The choice is reflected in GSSAPIBASE_LIBS
@@ -19879,7 +17161,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_resolv_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13499,40 +16452,52 @@
+@@ -13499,40 +16493,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19944,7 +17226,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13541,14 +16506,15 @@
+@@ -13541,14 +16547,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19953,7 +17235,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -19964,7 +17246,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_resolv_res_search = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
-@@ -13575,8 +16541,8 @@
+@@ -13575,8 +16582,8 @@
if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
gss_failed=0
@@ -19975,7 +17257,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13589,40 +16555,52 @@
+@@ -13589,40 +16596,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20040,7 +17322,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13631,14 +16609,15 @@
+@@ -13631,14 +16650,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20049,7 +17331,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20060,7 +17342,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
gss_impl="heimdal"
else
-@@ -13651,14 +16630,97 @@
+@@ -13651,14 +16671,97 @@
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
@@ -20136,7 +17418,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ ac_cv_lib_krb5support_krb5int_getspecific=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -20161,7 +17443,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13666,40 +16728,52 @@
+@@ -13666,40 +16769,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20226,7 +17508,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13708,14 +16782,15 @@
+@@ -13708,14 +16823,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20235,7 +17517,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20246,7 +17528,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
gss_impl="mit"
else
-@@ -13747,8 +16822,8 @@
+@@ -13747,8 +16863,8 @@
# library (older CyberSafe)
unset ac_cv_lib_gss_csf_gss_acq_user
@@ -20257,7 +17539,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13761,40 +16836,52 @@
+@@ -13761,40 +16877,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20322,7 +17604,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13803,20 +16890,21 @@
+@@ -13803,20 +16931,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20331,7 +17613,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20350,7 +17632,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13829,40 +16917,52 @@
+@@ -13829,40 +16958,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20415,7 +17697,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13871,14 +16971,15 @@
+@@ -13871,14 +17012,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20424,7 +17706,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20435,7 +17717,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
gss_impl="cybersafe"
else
-@@ -13901,8 +17002,8 @@
+@@ -13901,8 +17043,8 @@
if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
gss_failed=0
@@ -20446,7 +17728,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13915,40 +17016,52 @@
+@@ -13915,40 +17057,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20511,7 +17793,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13957,14 +17070,15 @@
+@@ -13957,14 +17111,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20520,7 +17802,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20531,7 +17813,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_gss_gss_unwrap = yes; then
gss_impl="seam"
else
-@@ -13977,8 +17091,8 @@
+@@ -13977,8 +17132,8 @@
fi
if test "$gss_impl" = "mit"; then
@@ -20542,7 +17824,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-@@ -14155,13 +17269,13 @@
+@@ -14155,13 +17310,13 @@
fi
GSSAPI_LIBS=""
@@ -20562,7 +17844,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_resolv_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14174,40 +17288,52 @@
+@@ -14174,40 +17329,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20627,7 +17909,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14216,14 +17342,15 @@
+@@ -14216,14 +17383,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20636,7 +17918,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -20647,7 +17929,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_resolv_res_search = yes; then
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
fi
-@@ -14238,9 +17365,9 @@
+@@ -14238,9 +17406,9 @@
for ac_func in gsskrb5_register_acceptor_identity
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -20660,7 +17942,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -14266,53 +17393,59 @@
+@@ -14266,53 +17434,59 @@
#undef $ac_func
@@ -20739,7 +18021,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14321,13 +17454,15 @@
+@@ -14321,13 +17495,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20748,7 +18030,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -20759,7 +18041,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14338,8 +17473,8 @@
+@@ -14338,8 +17514,8 @@
LIBS="$cmu_save_LIBS"
else
@@ -20770,7 +18052,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-@@ -14347,25 +17482,25 @@
+@@ -14347,25 +17523,25 @@
@@ -20804,7 +18086,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
SASLFLAGS=""
LIB_SASL=""
-@@ -14393,17 +17528,17 @@
+@@ -14393,17 +17569,17 @@
fi
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -20828,7 +18110,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14414,24 +17549,36 @@
+@@ -14414,24 +17590,36 @@
#include <sasl/sasl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -20873,7 +18155,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14440,15 +17587,16 @@
+@@ -14440,15 +17628,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20896,7 +18178,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14457,8 +17605,13 @@
+@@ -14457,8 +17646,13 @@
/* end confdefs.h. */
#include <sasl/sasl.h>
_ACEOF
@@ -20912,7 +18194,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -14482,9 +17635,10 @@
+@@ -14482,9 +17676,10 @@
ac_header_preproc=no
fi
@@ -20925,7 +18207,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14508,40 +17662,33 @@
+@@ -14508,40 +17703,33 @@
echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
@@ -20977,7 +18259,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14552,24 +17699,36 @@
+@@ -14552,24 +17740,36 @@
#include <sasl/saslutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -21022,7 +18304,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14578,15 +17737,16 @@
+@@ -14578,15 +17778,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21045,7 +18327,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14595,8 +17755,13 @@
+@@ -14595,8 +17796,13 @@
/* end confdefs.h. */
#include <sasl/saslutil.h>
_ACEOF
@@ -21061,7 +18343,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -14620,9 +17785,10 @@
+@@ -14620,9 +17826,10 @@
ac_header_preproc=no
fi
@@ -21074,7 +18356,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14646,39 +17812,32 @@
+@@ -14646,39 +17853,32 @@
echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
@@ -21123,7 +18405,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
{ { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
{ (exit 1); exit 1; }; }
-@@ -14690,8 +17849,8 @@
+@@ -14690,8 +17890,8 @@
@@ -21134,7 +18416,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-@@ -14723,17 +17882,17 @@
+@@ -14723,17 +17923,17 @@
# be sure to check for a SASLv2 specific function
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -21158,7 +18440,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14744,24 +17903,36 @@
+@@ -14744,24 +17944,36 @@
#include <sasl/sasl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -21203,7 +18485,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14770,15 +17941,16 @@
+@@ -14770,15 +17982,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21226,7 +18508,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14787,8 +17959,13 @@
+@@ -14787,8 +18000,13 @@
/* end confdefs.h. */
#include <sasl/sasl.h>
_ACEOF
@@ -21242,7 +18524,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -14812,9 +17989,10 @@
+@@ -14812,9 +18030,10 @@
ac_header_preproc=no
fi
@@ -21255,7 +18537,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14838,40 +18016,33 @@
+@@ -14838,40 +18057,33 @@
echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
@@ -21307,7 +18589,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14882,24 +18053,36 @@
+@@ -14882,24 +18094,36 @@
#include <sasl/saslutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -21352,7 +18634,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14908,15 +18091,16 @@
+@@ -14908,15 +18132,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21375,7 +18657,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14925,8 +18109,13 @@
+@@ -14925,8 +18150,13 @@
/* end confdefs.h. */
#include <sasl/saslutil.h>
_ACEOF
@@ -21391,7 +18673,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -14950,9 +18139,10 @@
+@@ -14950,9 +18180,10 @@
ac_header_preproc=no
fi
@@ -21404,7 +18686,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14976,30 +18166,23 @@
+@@ -14976,30 +18207,23 @@
echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
@@ -21442,7 +18724,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15012,40 +18195,52 @@
+@@ -15012,40 +18236,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21507,7 +18789,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15054,14 +18249,15 @@
+@@ -15054,14 +18290,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21516,7 +18798,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -21527,7 +18809,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_sasl2_prop_get = yes; then
ac_cv_found_sasl=yes
else
-@@ -15152,8 +18348,13 @@
+@@ -15152,8 +18389,13 @@
#endif
_ACEOF
@@ -21543,7 +18825,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -15179,6 +18380,7 @@
+@@ -15179,6 +18421,7 @@
echo "$as_me: error: Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -21551,7 +18833,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
rm -f conftest.err conftest.$ac_ext
CPPFLAGS=$cmu_saved_CPPFLAGS
-@@ -15189,8 +18391,8 @@
+@@ -15189,8 +18432,8 @@
LDFLAGS="$LDFLAGS $LIB_SASL"
@@ -21562,7 +18844,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15203,40 +18405,52 @@
+@@ -15203,40 +18446,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21627,7 +18909,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15245,14 +18459,15 @@
+@@ -15245,14 +18500,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21636,7 +18918,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -21647,7 +18929,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -15270,13 +18485,13 @@
+@@ -15270,13 +18526,13 @@
@@ -21665,7 +18947,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${with_perl}" = yes; then
with_perl="perl"
-@@ -15291,8 +18506,8 @@
+@@ -15291,8 +18547,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
@@ -21676,7 +18958,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_prog_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15305,25 +18520,27 @@
+@@ -15305,25 +18561,27 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21709,7 +18991,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test -n "$PERL" && break
done
test -n "$PERL" || PERL="with_perl=notfound"
-@@ -15352,8 +18569,8 @@
+@@ -15352,8 +18610,8 @@
PERL_DEPSUBDIRS="none"
fi
@@ -21720,7 +19002,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_func_MD5Init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15380,53 +18597,59 @@
+@@ -15380,53 +18638,59 @@
#undef MD5Init
@@ -21799,7 +19081,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15435,18 +18658,19 @@
+@@ -15435,18 +18699,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21808,7 +19090,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
@@ -21825,7 +19107,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_md_MD5Init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15459,40 +18683,52 @@
+@@ -15459,40 +18724,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21890,7 +19172,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15501,14 +18737,15 @@
+@@ -15501,14 +18778,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21899,7 +19181,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -21910,7 +19192,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_md_MD5Init = yes; then
LIBS="${LIBS} -lmd"
else
-@@ -15523,13 +18760,13 @@
+@@ -15523,13 +18801,13 @@
@@ -21929,7 +19211,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15540,36 +18777,49 @@
+@@ -15540,36 +18818,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21989,7 +19271,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15578,23 +18828,23 @@
+@@ -15578,20 +18869,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22007,29 +19289,22 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $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.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test "$ac_cv_type_long" = yes; then
+ 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
-@@ -15604,10 +18854,12 @@
++ # 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.
+@@ -15604,10 +18896,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -22038,7 +19313,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -15615,24 +18867,36 @@
+@@ -15615,24 +18908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22083,12 +19358,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15645,10 +18909,12 @@
+@@ -15645,10 +18950,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -22097,7 +19371,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -15656,24 +18922,36 @@
+@@ -15656,24 +18962,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22142,7 +19416,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15682,30 +18960,33 @@
+@@ -15682,30 +19000,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22175,8 +19449,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -22185,7 +19458,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -15713,24 +18994,36 @@
+@@ -15713,24 +19033,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22230,12 +19503,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15743,10 +19036,12 @@
+@@ -15743,10 +19075,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -22244,7 +19516,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -15754,24 +19049,36 @@
+@@ -15754,24 +19087,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22289,7 +19561,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15780,24 +19087,27 @@
+@@ -15780,24 +19125,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22327,12 +19599,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# 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`
-@@ -15808,10 +19118,12 @@
+@@ -15808,10 +19156,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
++ typedef long ac__type_sizeof_;
int
main ()
{
@@ -22341,7 +19612,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
test_array [0] = 0
;
-@@ -15819,24 +19131,36 @@
+@@ -15819,24 +19168,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22386,7 +19657,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15845,26 +19169,24 @@
+@@ -15845,26 +19206,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22400,17 +19671,13 @@ diff -urNad cyrus-imapd-2.2.13~/configur
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -22423,20 +19690,19 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15872,8 +19194,10 @@
+@@ -15872,8 +19227,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+
++ 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
-@@ -15882,35 +19206,44 @@
+@@ -15882,35 +19238,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -22494,13 +19760,12 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15921,29 +19254,32 @@
+@@ -15921,29 +19286,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -22509,24 +19774,18 @@ diff -urNad cyrus-imapd-2.2.13~/configur
-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_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
--else
-- ac_cv_sizeof_long=0
+ else
+ ac_cv_sizeof_long=0
+ 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_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
@@ -22539,7 +19798,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_cmu_lib_subdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15961,8 +19297,8 @@
+@@ -15961,8 +19325,8 @@
ac_cv_cmu_lib_subdir=$with_lib_subdir
fi
fi
@@ -22550,7 +19809,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-@@ -15970,21 +19306,21 @@
+@@ -15970,21 +19334,21 @@
@@ -22578,7 +19837,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_wrap_request_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15997,40 +19333,52 @@
+@@ -15997,40 +19361,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22643,7 +19902,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16039,28 +19387,29 @@
+@@ -16039,28 +19415,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22652,7 +19911,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22683,7 +19942,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16071,24 +19420,36 @@
+@@ -16071,24 +19448,36 @@
#include <tcpd.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -22728,7 +19987,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16097,15 +19458,16 @@
+@@ -16097,15 +19486,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22751,7 +20010,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16114,8 +19476,13 @@
+@@ -16114,8 +19504,13 @@
/* end confdefs.h. */
#include <tcpd.h>
_ACEOF
@@ -22767,7 +20026,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -16139,9 +19506,10 @@
+@@ -16139,9 +19534,10 @@
ac_header_preproc=no
fi
@@ -22780,7 +20039,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16165,25 +19533,18 @@
+@@ -16165,25 +19561,18 @@
echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
@@ -22811,7 +20070,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_tcpd_h = yes; then
-@@ -16199,10 +19560,10 @@
+@@ -16199,10 +19588,10 @@
LIBS="$cmu_save_LIBS"
fi
@@ -22826,7 +20085,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
LIB_WRAP=""
if test "$with_libwrap" != no; then
-@@ -16211,8 +19572,8 @@
+@@ -16211,8 +19600,8 @@
_ACEOF
LIB_WRAP="-lwrap"
@@ -22837,7 +20096,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16225,40 +19586,52 @@
+@@ -16225,40 +19614,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22902,7 +20161,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16267,14 +19640,15 @@
+@@ -16267,14 +19668,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22911,7 +20170,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22922,7 +20181,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
LIB_WRAP="${LIB_WRAP} -lnsl"
fi
-@@ -16286,28 +19660,28 @@
+@@ -16286,28 +19688,28 @@
@@ -22961,7 +20220,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16323,34 +19697,35 @@
+@@ -16323,34 +19725,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23005,7 +20264,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-@@ -16364,11 +19739,11 @@
+@@ -16364,11 +19767,11 @@
_ACEOF
@@ -23021,7 +20280,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
{ echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
fi
-@@ -16379,8 +19754,8 @@
+@@ -16379,8 +19782,8 @@
LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
fi
cmu_save_LIBS="$LIBS"
@@ -23032,7 +20291,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16393,40 +19768,52 @@
+@@ -16393,40 +19796,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23097,7 +20356,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16435,28 +19822,29 @@
+@@ -16435,28 +19850,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23106,7 +20365,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23137,7 +20396,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16467,24 +19855,36 @@
+@@ -16467,24 +19883,36 @@
#include <ucd-snmp/version.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -23182,7 +20441,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16493,15 +19893,16 @@
+@@ -16493,15 +19921,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23205,7 +20464,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16510,8 +19911,13 @@
+@@ -16510,8 +19939,13 @@
/* end confdefs.h. */
#include <ucd-snmp/version.h>
_ACEOF
@@ -23221,7 +20480,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -16535,9 +19941,10 @@
+@@ -16535,9 +19969,10 @@
ac_header_preproc=no
fi
@@ -23234,7 +20493,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16561,25 +19968,18 @@
+@@ -16561,25 +19996,18 @@
echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
@@ -23265,7 +20524,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
if test $ac_cv_header_ucd_snmp_version_h = yes; then
-@@ -16595,10 +19995,10 @@
+@@ -16595,10 +20023,10 @@
LIBS="$cmu_save_LIBS"
fi
@@ -23280,7 +20539,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
-@@ -16607,8 +20007,8 @@
+@@ -16607,8 +20035,8 @@
_ACEOF
LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
@@ -23291,7 +20550,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16621,40 +20021,52 @@
+@@ -16621,40 +20049,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23356,7 +20615,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16663,14 +20075,15 @@
+@@ -16663,14 +20103,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23365,7 +20624,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23376,7 +20635,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
fi
-@@ -16729,7 +20142,8 @@
+@@ -16729,7 +20170,8 @@
@@ -23386,7 +20645,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -16748,39 +20162,58 @@
+@@ -16748,39 +20190,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -23461,7 +20720,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
fi
fi
rm -f confcache
-@@ -16789,32 +20222,18 @@
+@@ -16789,32 +20250,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -23500,7 +20759,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
done
LIBOBJS=$ac_libobjs
-@@ -16852,11 +20271,35 @@
+@@ -16852,11 +20299,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -23538,7 +20797,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -16865,8 +20308,43 @@
+@@ -16865,8 +20336,43 @@
fi
@@ -23583,7 +20842,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
PS1='$ '
PS2='> '
PS4='+ '
-@@ -16880,18 +20358,19 @@
+@@ -16880,18 +20386,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -23606,7 +20865,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
as_basename=basename
else
as_basename=false
-@@ -16899,159 +20378,120 @@
+@@ -16899,159 +20406,120 @@
# Name of the executable.
@@ -23623,14 +20882,6 @@ diff -urNad cyrus-imapd-2.2.13~/configur
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -23645,6 +20896,16 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ }
+ s/.*/./; q'`
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++# CDPATH.
++$as_unset CDPATH
+
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
@@ -23657,14 +20918,12 @@ diff -urNad cyrus-imapd-2.2.13~/configur
- fi
- rm -f conf$$.sh
-fi
-+# CDPATH.
-+$as_unset CDPATH
-- 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" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
@@ -23677,7 +20936,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
+-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -23701,10 +20960,10 @@ diff -urNad cyrus-imapd-2.2.13~/configur
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- 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; }
@@ -23837,7 +21096,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -17060,7 +20500,19 @@
+@@ -17060,7 +20528,19 @@
as_mkdir_p=false
fi
@@ -23858,7 +21117,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# 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'"
-@@ -17069,31 +20521,14 @@
+@@ -17069,31 +20549,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -23890,11 +21149,11 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17101,30 +20536,19 @@
+@@ -17101,30 +20564,19 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -23932,16 +21191,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -17132,7 +20556,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -17148,19 +20572,21 @@
+@@ -17148,19 +20600,21 @@
$config_headers
Report bugs to <bug-autoconf at gnu.org>."
@@ -23953,7 +21203,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60a,
++configured by $0, generated by GNU Autoconf 2.60,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -23969,7 +21219,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -17171,39 +20597,24 @@
+@@ -17171,39 +20625,24 @@
do
case $1 in
--*=*)
@@ -24015,7 +21265,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -17213,18 +20624,24 @@
+@@ -17213,18 +20652,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -24045,7 +21295,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
esac
shift
-@@ -17240,37 +20657,51 @@
+@@ -17240,37 +20685,51 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -24114,7 +21364,7 @@ diff -urNad cyrus-imapd-2.2.13~/configur
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -17281,626 +20712,621 @@
+@@ -17281,373 +20740,483 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -24416,8 +21666,8 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
+LEX!$LEX$ac_delim
-+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+LEXLIB!$LEXLIB$ac_delim
++LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+SIEVE_SUBDIRS!$SIEVE_SUBDIRS$ac_delim
+WITH_NONBLOCK!$WITH_NONBLOCK$ac_delim
+WITH_GMTOFF!$WITH_GMTOFF$ac_delim
@@ -24888,8 +22138,8 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
@@ -24898,15 +22148,15 @@ diff -urNad cyrus-imapd-2.2.13~/configur
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
-+_ACEOF
+ _ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
- _ACEOF
+@@ -17655,252 +21224,137 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -25264,65 +22514,10 @@ diff -urNad cyrus-imapd-2.2.13~/configur
{ (exit 0); exit 0; }
_ACEOF
-diff -urNad cyrus-imapd-2.2.13~/install-sh cyrus-imapd-2.2.13/install-sh
---- cyrus-imapd-2.2.13~/install-sh 2006-10-10 15:28:48.000000000 +0000
-+++ cyrus-imapd-2.2.13/install-sh 2006-10-10 15:28:55.000000000 +0000
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-02-02.21
-+scriptversion=2005-05-14.22
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-diff -urNad cyrus-imapd-2.2.13~/mkinstalldirs cyrus-imapd-2.2.13/mkinstalldirs
---- cyrus-imapd-2.2.13~/mkinstalldirs 2006-10-10 15:28:48.000000000 +0000
-+++ cyrus-imapd-2.2.13/mkinstalldirs 2006-10-10 15:28:55.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-02-02.21
-+scriptversion=2005-06-29.22
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -12,7 +12,7 @@
- # <automake-patches at gnu.org>.
-
- errstatus=0
--dirmode=""
-+dirmode=
-
- usage="\
- Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-@@ -103,13 +103,21 @@
-
- for file
- do
-- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ case $file in
-+ /*) pathcomp=/ ;;
-+ *) pathcomp= ;;
-+ esac
-+ oIFS=$IFS
-+ IFS=/
-+ set fnord $file
- shift
-+ IFS=$oIFS
-
-- pathcomp=
- for d
- do
-- pathcomp="$pathcomp$d"
-+ test "x$d" = x && continue
-+
-+ pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-@@ -124,7 +132,7 @@
+diff -urNad cyrus-imapd-2.2-2.2.13~/mkinstalldirs cyrus-imapd-2.2-2.2.13/mkinstalldirs
+--- cyrus-imapd-2.2-2.2.13~/mkinstalldirs 2007-02-23 18:59:42.000000000 +1100
++++ cyrus-imapd-2.2-2.2.13/mkinstalldirs 2007-02-23 18:59:43.000000000 +1100
+@@ -124,7 +124,7 @@
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
@@ -25331,7 +22526,7 @@ diff -urNad cyrus-imapd-2.2.13~/mkinstal
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
-@@ -134,7 +142,7 @@
+@@ -134,7 +134,7 @@
fi
fi
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list